Skip to content

Commit 5403419

Browse files
BorfBorf
committed
Made a start on loading spine models
Fixed some compile warnings
1 parent 4174fde commit 5403419

File tree

8 files changed

+411
-5
lines changed

8 files changed

+411
-5
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "externals/bullet3"]
22
path = externals/bullet3
33
url = https://github.com/bulletphysics/bullet3
4+
[submodule "externals/spine"]
5+
path = externals/spine
6+
url = https://github.com/EsotericSoftware/spine-runtimes.git

‎blib.vcxproj

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<ClInclude Include="blib\Shader.h" />
7777
<ClInclude Include="blib\Shapes.h" />
7878
<ClInclude Include="blib\SkelAnimatedModel.h" />
79+
<ClInclude Include="blib\SpineModel.h" />
7980
<ClInclude Include="blib\SpriteBatch.h" />
8081
<ClInclude Include="blib\SpriteSheet.h" />
8182
<ClInclude Include="blib\StaticModel.h" />
@@ -461,6 +462,7 @@
461462
<ClInclude Include="externals\poly2tri\sweep\cdt.h" />
462463
<ClInclude Include="externals\poly2tri\sweep\sweep.h" />
463464
<ClInclude Include="externals\poly2tri\sweep\sweep_context.h" />
465+
<ClInclude Include="externals\spine\spine-c\src\spine\Json.h" />
464466
</ItemGroup>
465467
<ItemGroup>
466468
<ClCompile Include="blib\AnimatableSprite.cpp" />
@@ -513,6 +515,7 @@
513515
<ClCompile Include="blib\Shader.cpp" />
514516
<ClCompile Include="blib\Shapes.cpp" />
515517
<ClCompile Include="blib\SkelAnimatedModel.cpp" />
518+
<ClCompile Include="blib\SpineModel.cpp" />
516519
<ClCompile Include="blib\SpriteBatch.cpp" />
517520
<ClCompile Include="blib\SpriteSheet.cpp" />
518521
<ClCompile Include="blib\StaticModel.cpp" />
@@ -753,6 +756,32 @@
753756
<ClCompile Include="externals\poly2tri\sweep\cdt.cc" />
754757
<ClCompile Include="externals\poly2tri\sweep\sweep.cc" />
755758
<ClCompile Include="externals\poly2tri\sweep\sweep_context.cc" />
759+
<ClCompile Include="externals\spine\spine-c\src\spine\Animation.c" />
760+
<ClCompile Include="externals\spine\spine-c\src\spine\AnimationState.c" />
761+
<ClCompile Include="externals\spine\spine-c\src\spine\AnimationStateData.c" />
762+
<ClCompile Include="externals\spine\spine-c\src\spine\Atlas.c" />
763+
<ClCompile Include="externals\spine\spine-c\src\spine\AtlasAttachmentLoader.c" />
764+
<ClCompile Include="externals\spine\spine-c\src\spine\Attachment.c" />
765+
<ClCompile Include="externals\spine\spine-c\src\spine\AttachmentLoader.c" />
766+
<ClCompile Include="externals\spine\spine-c\src\spine\Bone.c" />
767+
<ClCompile Include="externals\spine\spine-c\src\spine\BoneData.c" />
768+
<ClCompile Include="externals\spine\spine-c\src\spine\BoundingBoxAttachment.c" />
769+
<ClCompile Include="externals\spine\spine-c\src\spine\Event.c" />
770+
<ClCompile Include="externals\spine\spine-c\src\spine\EventData.c" />
771+
<ClCompile Include="externals\spine\spine-c\src\spine\extension.c" />
772+
<ClCompile Include="externals\spine\spine-c\src\spine\IkConstraint.c" />
773+
<ClCompile Include="externals\spine\spine-c\src\spine\IkConstraintData.c" />
774+
<ClCompile Include="externals\spine\spine-c\src\spine\Json.c" />
775+
<ClCompile Include="externals\spine\spine-c\src\spine\MeshAttachment.c" />
776+
<ClCompile Include="externals\spine\spine-c\src\spine\RegionAttachment.c" />
777+
<ClCompile Include="externals\spine\spine-c\src\spine\Skeleton.c" />
778+
<ClCompile Include="externals\spine\spine-c\src\spine\SkeletonBounds.c" />
779+
<ClCompile Include="externals\spine\spine-c\src\spine\SkeletonData.c" />
780+
<ClCompile Include="externals\spine\spine-c\src\spine\SkeletonJson.c" />
781+
<ClCompile Include="externals\spine\spine-c\src\spine\Skin.c" />
782+
<ClCompile Include="externals\spine\spine-c\src\spine\SkinnedMeshAttachment.c" />
783+
<ClCompile Include="externals\spine\spine-c\src\spine\Slot.c" />
784+
<ClCompile Include="externals\spine\spine-c\src\spine\SlotData.c" />
756785
</ItemGroup>
757786
<ItemGroup>
758787
<None Include="externals\glew\doc\credits.html" />
@@ -799,7 +828,7 @@
799828
<Optimization>Disabled</Optimization>
800829
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
801830
<ObjectFileName>$(IntDir)\%(RelativeDir)\</ObjectFileName>
802-
<AdditionalIncludeDirectories>.;externals\glew\include;externals;externals\box2d;externals\bullet3\src;externals\openal\include</AdditionalIncludeDirectories>
831+
<AdditionalIncludeDirectories>.;externals\glew\include;externals;externals\box2d;externals\bullet3\src;externals\openal\include;externals\spine\spine-c\include</AdditionalIncludeDirectories>
803832
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
804833
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
805834
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -811,7 +840,7 @@
811840
<GenerateDebugInformation>true</GenerateDebugInformation>
812841
</Link>
813842
<Lib>
814-
<AdditionalDependencies>opengl32.lib;glew32s.lib;winmm.lib;dinput8.lib;dxguid.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
843+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
815844
<AdditionalLibraryDirectories>$(ProjectDir)\externals\glew\lib;$(ProjectDir)\externals\openal\libs</AdditionalLibraryDirectories>
816845
</Lib>
817846
<PreBuildEvent>
@@ -829,7 +858,7 @@
829858
<IntrinsicFunctions>true</IntrinsicFunctions>
830859
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;NDEBUG;_LIB;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
831860
<ObjectFileName>$(IntDir)\%(RelativeDir)\</ObjectFileName>
832-
<AdditionalIncludeDirectories>.;externals\glew\include;externals;externals\box2d;externals\bullet3\src;externals\openal\include</AdditionalIncludeDirectories>
861+
<AdditionalIncludeDirectories>.;externals\glew\include;externals;externals\box2d;externals\bullet3\src;externals\openal\include;externals\spine\spine-c\include</AdditionalIncludeDirectories>
833862
<MultiProcessorCompilation>true</MultiProcessorCompilation>
834863
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
835864
</ClCompile>
@@ -840,7 +869,7 @@
840869
<OptimizeReferences>true</OptimizeReferences>
841870
</Link>
842871
<Lib>
843-
<AdditionalDependencies>opengl32.lib;glew32s.lib;winmm.lib;dinput8.lib;dxguid.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
872+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
844873
<AdditionalLibraryDirectories>$(ProjectDir)\externals\glew\lib;$(ProjectDir)\externals\openal\libs</AdditionalLibraryDirectories>
845874
</Lib>
846875
<PreBuildEvent>

‎blib.vcxproj.filters

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@
7676
<Filter Include="external\bullet\BulletDynamics">
7777
<UniqueIdentifier>{4876fd2e-a643-488b-b846-55545362594e}</UniqueIdentifier>
7878
</Filter>
79+
<Filter Include="external\spine">
80+
<UniqueIdentifier>{23e76cbf-855a-4bf7-8f1c-e572e55afcb2}</UniqueIdentifier>
81+
</Filter>
82+
<Filter Include="spine">
83+
<UniqueIdentifier>{cfa88894-fa4f-4679-99b6-b468746dbea7}</UniqueIdentifier>
84+
</Filter>
7985
</ItemGroup>
8086
<ItemGroup>
8187
<ClInclude Include="blib\VIO.h" />
@@ -1352,6 +1358,10 @@
13521358
<Filter>audio</Filter>
13531359
</ClInclude>
13541360
<ClInclude Include="blib\NavMesh.h" />
1361+
<ClInclude Include="externals\spine\spine-c\src\spine\Json.h">
1362+
<Filter>external\spine</Filter>
1363+
</ClInclude>
1364+
<ClInclude Include="blib\SpineModel.h" />
13551365
</ItemGroup>
13561366
<ItemGroup>
13571367
<ClCompile Include="blib\Window.cpp" />
@@ -2168,6 +2178,85 @@
21682178
</ClCompile>
21692179
<ClCompile Include="blib\NavMesh.cpp" />
21702180
<ClCompile Include="blib\Resource.cpp" />
2181+
<ClCompile Include="externals\spine\spine-c\src\spine\Animation.c">
2182+
<Filter>external\spine</Filter>
2183+
</ClCompile>
2184+
<ClCompile Include="externals\spine\spine-c\src\spine\AnimationState.c">
2185+
<Filter>external\spine</Filter>
2186+
</ClCompile>
2187+
<ClCompile Include="externals\spine\spine-c\src\spine\AnimationStateData.c">
2188+
<Filter>external\spine</Filter>
2189+
</ClCompile>
2190+
<ClCompile Include="externals\spine\spine-c\src\spine\Atlas.c">
2191+
<Filter>external\spine</Filter>
2192+
</ClCompile>
2193+
<ClCompile Include="externals\spine\spine-c\src\spine\AtlasAttachmentLoader.c">
2194+
<Filter>external\spine</Filter>
2195+
</ClCompile>
2196+
<ClCompile Include="externals\spine\spine-c\src\spine\Attachment.c">
2197+
<Filter>external\spine</Filter>
2198+
</ClCompile>
2199+
<ClCompile Include="externals\spine\spine-c\src\spine\AttachmentLoader.c">
2200+
<Filter>external\spine</Filter>
2201+
</ClCompile>
2202+
<ClCompile Include="externals\spine\spine-c\src\spine\Bone.c">
2203+
<Filter>external\spine</Filter>
2204+
</ClCompile>
2205+
<ClCompile Include="externals\spine\spine-c\src\spine\BoneData.c">
2206+
<Filter>external\spine</Filter>
2207+
</ClCompile>
2208+
<ClCompile Include="externals\spine\spine-c\src\spine\BoundingBoxAttachment.c">
2209+
<Filter>external\spine</Filter>
2210+
</ClCompile>
2211+
<ClCompile Include="externals\spine\spine-c\src\spine\Event.c">
2212+
<Filter>external\spine</Filter>
2213+
</ClCompile>
2214+
<ClCompile Include="externals\spine\spine-c\src\spine\EventData.c">
2215+
<Filter>external\spine</Filter>
2216+
</ClCompile>
2217+
<ClCompile Include="externals\spine\spine-c\src\spine\extension.c">
2218+
<Filter>external\spine</Filter>
2219+
</ClCompile>
2220+
<ClCompile Include="externals\spine\spine-c\src\spine\IkConstraint.c">
2221+
<Filter>external\spine</Filter>
2222+
</ClCompile>
2223+
<ClCompile Include="externals\spine\spine-c\src\spine\IkConstraintData.c">
2224+
<Filter>external\spine</Filter>
2225+
</ClCompile>
2226+
<ClCompile Include="externals\spine\spine-c\src\spine\Json.c">
2227+
<Filter>external\spine</Filter>
2228+
</ClCompile>
2229+
<ClCompile Include="externals\spine\spine-c\src\spine\MeshAttachment.c">
2230+
<Filter>external\spine</Filter>
2231+
</ClCompile>
2232+
<ClCompile Include="externals\spine\spine-c\src\spine\RegionAttachment.c">
2233+
<Filter>external\spine</Filter>
2234+
</ClCompile>
2235+
<ClCompile Include="externals\spine\spine-c\src\spine\Skeleton.c">
2236+
<Filter>external\spine</Filter>
2237+
</ClCompile>
2238+
<ClCompile Include="externals\spine\spine-c\src\spine\SkeletonBounds.c">
2239+
<Filter>external\spine</Filter>
2240+
</ClCompile>
2241+
<ClCompile Include="externals\spine\spine-c\src\spine\SkeletonData.c">
2242+
<Filter>external\spine</Filter>
2243+
</ClCompile>
2244+
<ClCompile Include="externals\spine\spine-c\src\spine\SkeletonJson.c">
2245+
<Filter>external\spine</Filter>
2246+
</ClCompile>
2247+
<ClCompile Include="externals\spine\spine-c\src\spine\Skin.c">
2248+
<Filter>external\spine</Filter>
2249+
</ClCompile>
2250+
<ClCompile Include="externals\spine\spine-c\src\spine\SkinnedMeshAttachment.c">
2251+
<Filter>external\spine</Filter>
2252+
</ClCompile>
2253+
<ClCompile Include="externals\spine\spine-c\src\spine\Slot.c">
2254+
<Filter>external\spine</Filter>
2255+
</ClCompile>
2256+
<ClCompile Include="externals\spine\spine-c\src\spine\SlotData.c">
2257+
<Filter>external\spine</Filter>
2258+
</ClCompile>
2259+
<ClCompile Include="blib\SpineModel.cpp" />
21712260
</ItemGroup>
21722261
<ItemGroup>
21732262
<None Include="externals\glew\doc\credits.html">

‎blib.vcxproj.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ShowAllFiles>true</ShowAllFiles>
4+
<ShowAllFiles>false</ShowAllFiles>
55
</PropertyGroup>
66
</Project>

‎blib/App.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212

1313
#include <string.h> //memset
1414

15+
16+
#pragma comment(lib,"opengl32.lib")
17+
#pragma comment(lib,"glew32s.lib")
18+
#pragma comment(lib,"winmm.lib")
19+
#pragma comment(lib,"dinput8.lib")
20+
#pragma comment(lib,"dxguid.lib")
21+
#pragma comment(lib,"OpenAL32.lib")
22+
1523
namespace blib
1624
{
1725
enum class Key;

0 commit comments

Comments
 (0)