Experiments with AI and physics

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.7)
-project(boatshit)
+project(boat-racing-game)
 
 set(CMAKE_CXX_STANDARD 14)
 
@@ -16,14 +16,16 @@ find_package(DevIL REQUIRED)
 find_package(ASSIMP REQUIRED)
 find_package(OpenAL REQUIRED)
 
-add_executable(main main.cpp) #water.cpp sky.cpp)
+add_executable(game main.cpp particles.cpp) #water.cpp sky.cpp)
 
-target_include_directories(main PUBLIC
-  ${GLM_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS} ${CURL_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${ASSIMP_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR}
+target_compile_definitions(game PUBLIC -DGLM_ENABLE_EXPERIMENTAL)
+
+target_include_directories(game PUBLIC
+  ${GLM_INCLUDE_DIRS} ${CURL_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${ASSIMP_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR}
 )
 
-target_link_libraries(main
-  ${SDL2_LIBRARIES} ${CURL_LIBRARY} ${GLEW_LIBRARY} -lGL -lGLU ${IL_LIBRARIES} ${ILU_LIBRARIES} ${ASSIMP_LIBRARIES} ${OPENAL_LIBRARY} -lalut
+target_link_libraries(game
+  SDL2::SDL2 ${CURL_LIBRARY} ${GLEW_LIBRARY} -lGL -lGLU ${IL_LIBRARIES} ${ILU_LIBRARIES} ${ASSIMP_LIBRARIES} ${OPENAL_LIBRARY} -lalut
 )
 
 add_subdirectory(data)

boat.cpp

@@ -88,14 +88,14 @@ class Boat {
       float cornerRadius = finRudderDistance / sinf(rudderAngle);
       cornerRadius *= 1.0f + distance * distance * 0.5f; // FIXME: Hack to limit sharp corners at high speeds
 
-      position.x -= cornerRadius * sinf(-heading);
-      position.y -= cornerRadius * cosf(-heading);
-      heading -= distance / cornerRadius;
-      position.x += cornerRadius * sinf(-heading);
-      position.y += cornerRadius * cosf(-heading);
+      position.x += cornerRadius * cosf(-heading);
+      position.y += cornerRadius * sinf(-heading);
+      heading += distance / cornerRadius;
+      position.x -= cornerRadius * cosf(-heading);
+      position.y -= cornerRadius * sinf(-heading);
     } else {
-      position.x += distance * cosf(heading);
-      position.y += distance * sinf(heading);
+      position.x += distance * sinf(heading);
+      position.y += distance * cosf(heading);
     }
 
     input.steer = 0.0f; //FIXME: Clamp only!
@@ -118,11 +118,20 @@ class Boat {
     return position;
   }
 
+  glm::mat4 matrix() const {
+    glm::mat4 m = glm::mat4(1.0f);
+    m *= glm::translate(glm::vec3(position.x, position.y, position.z));
+    m *= glm::rotate(-heading, glm::vec3(0.0f, 0.0f, 1.0f));
+    return m;
+  }
+
   void draw() {
     //FIXME! Do translation etc
     glPushMatrix();
-    glTranslatef(position.x, position.y, position.z);
-    glRotatef(glm::degrees(heading), 0.0f, 0.0f, 1.0f);
+    //    glTranslatef(position.x, position.y, position.z);
+    //glRotatef(glm::degrees(heading), );
+    glMultMatrixf(glm::value_ptr(matrix()));
+    glRotatef(90.0f, 0.0f, 0.0f, 1.0f);
     model->draw();
     glPopMatrix();
   }

camera.cpp

@@ -19,7 +19,7 @@ class Camera {
   public:
 
   //FIXME: Supply fov in radians..
-  Camera() : fov(0.7853981634f), nearPlane(1.0f), farPlane(1000.0f) {}
+  Camera() : fov(0.7853981634f * 1.5f), nearPlane(1.0f), farPlane(1000.0f) {}
 
   void setFov(float fov) {
     this->fov = fov;