Jelajahi Sumber

Merge pull request #65 from blackberry-gaming/next-setaylor

Next setaylor
Sean Paul Taylor 14 tahun lalu
induk
melakukan
52804f6cd0

+ 1 - 0
gameplay/gameplay.vcxproj

@@ -168,6 +168,7 @@
     <None Include="res\shaders\solid.vsh" />
     <None Include="res\shaders\textured.fsh" />
     <None Include="res\shaders\textured.vsh" />
+    <None Include="res\textures\particle-default.png" />
     <None Include="src\BoundingBox.inl" />
     <None Include="src\BoundingSphere.inl" />
     <None Include="src\gameplay-main-macos.mm" />

+ 6 - 0
gameplay/gameplay.vcxproj.filters

@@ -10,6 +10,9 @@
     <Filter Include="res\shaders">
       <UniqueIdentifier>{be0b36f1-49ed-4a06-9f1f-57c654a554fe}</UniqueIdentifier>
     </Filter>
+    <Filter Include="res\textures">
+      <UniqueIdentifier>{7c4ef2fb-63f2-4d5a-b31e-0dc78329abfd}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Animation.cpp">
@@ -469,6 +472,9 @@
     <None Include="src\PlatformMacOS.mm">
       <Filter>src</Filter>
     </None>
+    <None Include="res\textures\particle-default.png">
+      <Filter>res\textures</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\PhysicsFixedConstraint.inl">

+ 1 - 1
gameplay/src/gameplay.h

@@ -65,6 +65,6 @@
 #include "PhysicsSocketConstraint.h"
 #include "PhysicsSpringConstraint.h"
 #include "PhysicsRigidBody.h"
-#include "PhysicsMotionState.h"
+