Skip to content

Commit

Permalink
Merge pull request #4 from marauder2k7/LiquidFun
Browse files Browse the repository at this point in the history
Changes for v3.5: box2d update, path, light object, and particle targeting
  • Loading branch information
greenfire27 authored Jun 29, 2020
2 parents d00e8c2 + d6d19f4 commit b9dcda8
Show file tree
Hide file tree
Showing 230 changed files with 59,927 additions and 21,170 deletions.
Binary file not shown.
Binary file not shown.
29 changes: 29 additions & 0 deletions engine/compilers/VisualStudio 2017/Torque 2D.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,12 @@
<ClCompile Include="..\..\source\2d\gui\SceneWindow.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\CompositeSprite.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\ParticlePlayer.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\Path.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\SceneObject.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\SceneObjectList.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\SceneObjectSet.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\Scroller.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\LightObject.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\ShapeVector.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\SkeletonObject.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\Sprite.cc" />
Expand Down Expand Up @@ -316,10 +318,13 @@
<ClCompile Include="..\..\source\Box2D\Collision\Shapes\b2PolygonShape.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2BlockAllocator.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2Draw.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2FreeList.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2Math.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2Settings.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2StackAllocator.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2Stat.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2Timer.cpp" />
<ClCompile Include="..\..\source\Box2D\Common\b2TrackedBlock.cpp" />
<ClCompile Include="..\..\source\Box2D\Dynamics\b2Body.cpp" />
<ClCompile Include="..\..\source\Box2D\Dynamics\b2ContactManager.cpp" />
<ClCompile Include="..\..\source\Box2D\Dynamics\b2Fixture.cpp" />
Expand Down Expand Up @@ -347,6 +352,11 @@
<ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.cpp" />
<ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
<ClCompile Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
<ClCompile Include="..\..\source\Box2D\Particle\b2Particle.cpp" />
<ClCompile Include="..\..\source\Box2D\Particle\b2ParticleAssembly.cpp" />
<ClCompile Include="..\..\source\Box2D\Particle\b2ParticleGroup.cpp" />
<ClCompile Include="..\..\source\Box2D\Particle\b2ParticleSystem.cpp" />
<ClCompile Include="..\..\source\Box2D\Particle\b2VoronoiDiagram.cpp" />
<ClCompile Include="..\..\source\Box2D\Rope\b2Rope.cpp" />
<ClCompile Include="..\..\source\collection\bitTables.cc" />
<ClCompile Include="..\..\source\collection\hashTable.cc" />
Expand Down Expand Up @@ -710,6 +720,8 @@
<ClInclude Include="..\..\source\2d\sceneobject\CompositeSprite_ScriptBinding.h" />
<ClInclude Include="..\..\source\2d\sceneobject\ParticlePlayer.h" />
<ClInclude Include="..\..\source\2d\sceneobject\ParticlePlayer_ScriptBinding.h" />
<ClInclude Include="..\..\source\2d\sceneobject\Path.h" />
<ClInclude Include="..\..\source\2d\sceneobject\Path_ScriptBinding.h" />
<ClInclude Include="..\..\source\2d\sceneobject\SceneObject.h" />
<ClInclude Include="..\..\source\2d\sceneobject\SceneObjectList.h" />
<ClInclude Include="..\..\source\2d\sceneobject\SceneObjectMoveToEvent.h" />
Expand All @@ -719,6 +731,8 @@
<ClInclude Include="..\..\source\2d\sceneobject\SceneObject_ScriptBinding.h" />
<ClInclude Include="..\..\source\2d\sceneobject\Scroller.h" />
<ClInclude Include="..\..\source\2d\sceneobject\Scroller_ScriptBinding.h" />
<ClInclude Include="..\..\source\2d\sceneobject\LightObject.h" />
<ClInclude Include="..\..\source\2d\sceneobject\LightObject_ScriptBinding.h" />
<ClInclude Include="..\..\source\2d\sceneobject\ShapeVector.h" />
<ClInclude Include="..\..\source\2d\sceneobject\ShapeVector_ScriptBinding.h" />
<ClInclude Include="..\..\source\2d\sceneobject\SkeletonObject.h" />
Expand Down Expand Up @@ -784,11 +798,17 @@
<ClInclude Include="..\..\source\Box2D\Collision\Shapes\b2Shape.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2BlockAllocator.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2Draw.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2FreeList.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2GrowableBuffer.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2GrowableStack.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2IntrusiveList.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2Math.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2Settings.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2SlabAllocator.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2StackAllocator.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2Stat.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2Timer.h" />
<ClInclude Include="..\..\source\Box2D\Common\b2TrackedBlock.h" />
<ClInclude Include="..\..\source\Box2D\Dynamics\b2Body.h" />
<ClInclude Include="..\..\source\Box2D\Dynamics\b2ContactManager.h" />
<ClInclude Include="..\..\source\Box2D\Dynamics\b2Fixture.h" />
Expand Down Expand Up @@ -817,6 +837,12 @@
<ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2RopeJoint.h" />
<ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WeldJoint.h" />
<ClInclude Include="..\..\source\Box2D\Dynamics\Joints\b2WheelJoint.h" />
<ClInclude Include="..\..\source\Box2D\Particle\b2Particle.h" />
<ClInclude Include="..\..\source\Box2D\Particle\b2ParticleAssembly.h" />
<ClInclude Include="..\..\source\Box2D\Particle\b2ParticleGroup.h" />
<ClInclude Include="..\..\source\Box2D\Particle\b2ParticleSystem.h" />
<ClInclude Include="..\..\source\Box2D\Particle\b2StackQueue.h" />
<ClInclude Include="..\..\source\Box2D\Particle\b2VoronoiDiagram.h" />
<ClInclude Include="..\..\source\Box2D\Rope\b2Rope.h" />
<ClInclude Include="..\..\source\collection\bitMatrix.h" />
<ClInclude Include="..\..\source\collection\bitSet.h" />
Expand Down Expand Up @@ -1308,6 +1334,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="..\..\source\Box2D\Particle\b2ParticleAssembly.neon.s" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
86 changes: 86 additions & 0 deletions engine/compilers/VisualStudio 2017/Torque 2D.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@
<Filter Include="bitmapFont">
<UniqueIdentifier>{447ecd65-a7a2-4e18-9c55-b53356c6f7a9}</UniqueIdentifier>
</Filter>
<Filter Include="Box2D\Particle">
<UniqueIdentifier>{b2903a96-6c49-4961-82a8-f1832989d4a4}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\source\audio\audio.cc">
Expand Down Expand Up @@ -1432,6 +1435,36 @@
<ClCompile Include="..\..\source\platform\platformNet.cpp" />
<ClCompile Include="..\..\source\platform\platformNetAsync.cpp" />
<ClCompile Include="..\..\source\platform\platformNet_ScriptBinding.cc" />
<ClCompile Include="..\..\source\Box2D\Particle\b2Particle.cpp">
<Filter>Box2D\Particle</Filter>
</ClCompile>
<ClCompile Include="..\..\source\Box2D\Particle\b2ParticleAssembly.cpp">
<Filter>Box2D\Particle</Filter>
</ClCompile>
<ClCompile Include="..\..\source\Box2D\Particle\b2ParticleGroup.cpp">
<Filter>Box2D\Particle</Filter>
</ClCompile>
<ClCompile Include="..\..\source\Box2D\Particle\b2ParticleSystem.cpp">
<Filter>Box2D\Particle</Filter>
</ClCompile>
<ClCompile Include="..\..\source\Box2D\Particle\b2VoronoiDiagram.cpp">
<Filter>Box2D\Particle</Filter>
</ClCompile>
<ClCompile Include="..\..\source\Box2D\Common\b2FreeList.cpp">
<Filter>Box2D\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\source\Box2D\Common\b2Stat.cpp">
<Filter>Box2D\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\source\Box2D\Common\b2TrackedBlock.cpp">
<Filter>Box2D\Common</Filter>
</ClCompile>
<ClCompile Include="..\..\source\2d\sceneobject\LightObject.cc">
<Filter>2d\sceneobject</Filter>
</ClCompile>
<ClCompile Include="..\..\source\2d\sceneobject\Path.cc">
<Filter>2d\sceneobject</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\source\audio\audio.h">
Expand Down Expand Up @@ -3180,6 +3213,54 @@
<ClInclude Include="..\..\source\platform\tmm_off.h" />
<ClInclude Include="..\..\source\platform\tmm_on.h" />
<ClInclude Include="..\..\source\platform\typetraits.h" />
<ClInclude Include="..\..\source\Box2D\Particle\b2VoronoiDiagram.h">
<Filter>Box2D\Particle</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Particle\b2Particle.h">
<Filter>Box2D\Particle</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Particle\b2ParticleAssembly.h">
<Filter>Box2D\Particle</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Particle\b2ParticleGroup.h">
<Filter>Box2D\Particle</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Particle\b2ParticleSystem.h">
<Filter>Box2D\Particle</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Particle\b2StackQueue.h">
<Filter>Box2D\Particle</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Common\b2FreeList.h">
<Filter>Box2D\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Common\b2GrowableBuffer.h">
<Filter>Box2D\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Common\b2IntrusiveList.h">
<Filter>Box2D\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Common\b2SlabAllocator.h">
<Filter>Box2D\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Common\b2Stat.h">
<Filter>Box2D\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\source\Box2D\Common\b2TrackedBlock.h">
<Filter>Box2D\Common</Filter>
</ClInclude>
<ClInclude Include="..\..\source\2d\sceneobject\Path.h">
<Filter>2d\sceneobject</Filter>
</ClInclude>
<ClInclude Include="..\..\source\2d\sceneobject\Path_ScriptBinding.h">
<Filter>2d\sceneobject</Filter>
</ClInclude>
<ClInclude Include="..\..\source\2d\sceneobject\LightObject.h">
<Filter>2d\sceneobject</Filter>
</ClInclude>
<ClInclude Include="..\..\source\2d\sceneobject\LightObject_ScriptBinding.h">
<Filter>2d\sceneobject</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\source\math\mMath_ASM.asm">
Expand All @@ -3198,4 +3279,9 @@
<ItemGroup>
<ResourceCompile Include="Torque 2D.rc" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\source\Box2D\Particle\b2ParticleAssembly.neon.s">
<Filter>Box2D\Particle</Filter>
</None>
</ItemGroup>
</Project>
Binary file added engine/compilers/VisualStudio 2019/Torque 2D.ico
Binary file not shown.
110 changes: 110 additions & 0 deletions engine/compilers/VisualStudio 2019/Torque 2D.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
//Microsoft Developer Studio generated resource script.
//
#include "../../Source/game/resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "windows.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32

/////////////////////////////////////////////////////////////////////////////
//
// Icon
//

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_TORQUE2D ICON DISCARDABLE "Torque 2D.ico"

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END

3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,0
PRODUCTVERSION 2,0,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "GarageGames LLC"
VALUE "FileDescription", "Torque 2D MIT"
VALUE "FileVersion", "2, 0, 0, 0"
VALUE "InternalName", "Torque 2D"
VALUE "LegalCopyright", "Copyright (c) 2013 GarageGames, LLC"
VALUE "OriginalFilename", "Torque2D.exe"
VALUE "ProductName", "Torque 2D MIT"
VALUE "ProductVersion", "2, 0, 0, 0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

Loading

0 comments on commit b9dcda8

Please sign in to comment.