VS support

CMakeLists.txt

@@ -127,5 +127,17 @@ if (APPLE OR UNIX)
     target_link_libraries(shooter "-framework OpenGL")
     target_link_libraries(shooter "-framework GLUT")
 else()
-
+    #OPENGL
+    find_package(OpenGL REQUIRED)
+    if (OpenGL_FOUND)
+        include_directories(${OpenGL_INCLUDE_DIR})
+        target_link_libraries(${PROJECT_NAME} ${OpenGL_LIBRARIES})
+        target_link_libraries(${PROJECT_NAME} GL)
+    endif()
+
+    find_package(GLEW 2.0 REQUIRED)
+    if (GLEW_FOUND)
+        include_directories(${GLEW_INCLUDE_DIR})
+        target_link_libraries(${PROJECT_NAME} ${GLEW_LIBRARIES})
+    endif()
 endif()

engine/Object.h

@@ -9,6 +9,7 @@
 #include "Vec3D.h"
 #include <string>
 #include <utility>
+#include <memory>
 
 class ObjectNameTag final {
 private:

shooter.vcxproj

@@ -168,7 +168,6 @@
     <ClCompile Include="engine\gui\Button.cpp" />
     <ClCompile Include="engine\gui\Window.cpp" />
     <ClCompile Include="engine\Keyboard.cpp" />
-    <ClCompile Include="engine\Matrix4x4.cpp" />
     <ClCompile Include="engine\Mesh.cpp" />
     <ClCompile Include="engine\Mouse.cpp" />
     <ClCompile Include="engine\network\ClientUDP.cpp" />
@@ -179,16 +178,15 @@
     <ClCompile Include="engine\network\UDPSocket.cpp" />
     <ClCompile Include="engine\Object.cpp" />
     <ClCompile Include="engine\physics\RigidBody.cpp" />
+    <ClCompile Include="engine\physics\Solver.cpp" />
     <ClCompile Include="engine\Plane.cpp" />
-    <ClCompile Include="engine\Point4D.cpp" />
     <ClCompile Include="engine\ResourceManager.cpp" />
     <ClCompile Include="engine\Screen.cpp" />
-    <ClCompile Include="engine\SoundController.cpp" />
     <ClCompile Include="engine\Triangle.cpp" />
     <ClCompile Include="engine\utils\Log.cpp" />
+    <ClCompile Include="engine\utils\Matrix4x4.cpp" />
+    <ClCompile Include="engine\utils\Point4D.cpp" />
     <ClCompile Include="engine\utils\Time.cpp" />
-    <ClCompile Include="engine\Vec2D.cpp" />
-    <ClCompile Include="engine\Vec3D.cpp" />
     <ClCompile Include="engine\World.cpp" />
     <ClCompile Include="Player.cpp" />
     <ClCompile Include="PlayerController.cpp" />
@@ -215,15 +213,14 @@
     <ClInclude Include="engine\animation\Interpolation.h" />
     <ClInclude Include="engine\animation\Timeline.h" />
     <ClInclude Include="engine\Camera.h" />
-    <ClInclude Include="engine\Consts.h" />
     <ClInclude Include="engine\Engine.h" />
     <ClInclude Include="engine\gui\Button.h" />
     <ClInclude Include="engine\gui\Window.h" />
     <ClInclude Include="engine\Keyboard.h" />
-    <ClInclude Include="engine\Matrix4x4.h" />
     <ClInclude Include="engine\Mesh.h" />
     <ClInclude Include="engine\Mouse.h" />
     <ClInclude Include="engine\network\ClientUDP.h" />
+    <ClInclude Include="engine\network\config.h" />
     <ClInclude Include="engine\network\MsgType.h" />
     <ClInclude Include="engine\network\ReliableMsg.h" />
     <ClInclude Include="engine\network\ServerUDP.h" />
@@ -232,22 +229,20 @@
     <ClInclude Include="engine\Object.h" />
     <ClInclude Include="engine\physics\RigidBody.h" />
     <ClInclude Include="engine\physics\Simplex.h" />
+    <ClInclude Include="engine\physics\Solver.h" />
     <ClInclude Include="engine\Plane.h" />
-    <ClInclude Include="engine\Point4D.h" />
     <ClInclude Include="engine\ResourceManager.h" />
     <ClInclude Include="engine\Screen.h" />
-    <ClInclude Include="engine\SoundController.h" />
     <ClInclude Include="engine\Triangle.h" />
     <ClInclude Include="engine\utils\Log.h" />
+    <ClInclude Include="engine\utils\Matrix4x4.h" />
+    <ClInclude Include="engine\utils\Point4D.h" />
     <ClInclude Include="engine\utils\Time.h" />
-    <ClInclude Include="engine\Vec2D.h" />
-    <ClInclude Include="engine\Vec3D.h" />
     <ClInclude Include="engine\World.h" />
     <ClInclude Include="Player.h" />
     <ClInclude Include="PlayerController.h" />
     <ClInclude Include="Server.h" />
     <ClInclude Include="Shooter.h" />
-    <ClInclude Include="ShooterConsts.h" />
     <ClInclude Include="weapon\Ak47.h" />
     <ClInclude Include="weapon\Gold_Ak47.h" />
     <ClInclude Include="weapon\Gun.h" />
@@ -255,6 +250,16 @@
     <ClInclude Include="weapon\Shotgun.h" />
     <ClInclude Include="weapon\Weapon.h" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="maps\materials.txt" />
+    <Text Include="obj\ability_mat.txt" />
+    <Text Include="obj\ak47_mat.txt" />
+    <Text Include="obj\gold_ak47_mat.txt" />
+    <Text Include="obj\gun_mat.txt" />
+    <Text Include="obj\hill_mat.txt" />
+    <Text Include="obj\rifle_mat.txt" />
+    <Text Include="obj\shotgun_mat.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

shooter.vcxproj.filters

@@ -72,12 +72,21 @@
     <ClCompile Include="engine\utils\Log.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
+    <ClCompile Include="engine\utils\Matrix4x4.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\utils\Point4D.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
     <ClCompile Include="engine\utils\Time.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
     <ClCompile Include="engine\physics\RigidBody.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
+    <ClCompile Include="engine\physics\Solver.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
     <ClCompile Include="engine\network\ClientUDP.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
@@ -123,21 +132,6 @@
     <ClCompile Include="weapon\Weapon.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="engine\Matrix4x4.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\Point4D.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\SoundController.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\Vec2D.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
-    <ClCompile Include="engine\Vec3D.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Bonus.h">
@@ -194,6 +188,12 @@
     <ClInclude Include="engine\utils\Log.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
+    <ClInclude Include="engine\utils\Matrix4x4.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\utils\Point4D.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
     <ClInclude Include="engine\utils\Time.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
@@ -203,9 +203,15 @@
     <ClInclude Include="engine\physics\Simplex.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
+    <ClInclude Include="engine\physics\Solver.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
     <ClInclude Include="engine\network\ClientUDP.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
+    <ClInclude Include="engine\network\config.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
     <ClInclude Include="engine\network\MsgType.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
@@ -275,26 +281,15 @@
     <ClInclude Include="weapon\Weapon.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="ShooterConsts.h">
+  </ItemGroup>
-      <Filter>Файлы заголовков</Filter>
+  <ItemGroup>
-    </ClInclude>
+    <Text Include="obj\ability_mat.txt" />
-    <ClInclude Include="engine\Consts.h">
+    <Text Include="obj\ak47_mat.txt" />
-      <Filter>Файлы заголовков</Filter>
+    <Text Include="obj\gold_ak47_mat.txt" />
-    </ClInclude>
+    <Text Include="obj\gun_mat.txt" />
-    <ClInclude Include="engine\Matrix4x4.h">
+    <Text Include="obj\hill_mat.txt" />
-      <Filter>Файлы заголовков</Filter>
+    <Text Include="obj\rifle_mat.txt" />
-    </ClInclude>
+    <Text Include="obj\shotgun_mat.txt" />
-    <ClInclude Include="engine\Point4D.h">
+    <Text Include="maps\materials.txt" />
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="engine\SoundController.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="engine\Vec2D.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
-    <ClInclude Include="engine\Vec3D.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>