Add line segement collisions (#75)

* adds mesh debug shapes

* adds tests on non-main branches

* stable rectangles

---------

Co-authored-by: harveydevereux <harveydevereux@googlemail.com>
Former-commit-id: f709bce

Author: Jerboa-app

.github/workflows/tests.yml .github/workflows/ci-builds.yml.github/workflows/tests.yml renamed to .github/workflows/ci-builds.yml

@@ -63,7 +63,7 @@ jobs:
 
     - name: linux-X-windows
       run: |
-        ./dependencies.sh -w && ./build.sh -w -t -d -r
+        ./dependencies.sh -w && ./build.sh -w -d -r
         mkdir windowsbuild
         cp build/libHop.a windowsbuild/
         cp -r include windowsbuild/

.github/workflows/unit-tests.yml

@@ -0,0 +1,31 @@
+name: Hop
+
+on:
+  push:
+    branches-ignore: 'main'
+    tags:     'v*'
+    paths-ignore:
+      - 'doc/**'
+      - '.github/**'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  linuxXlinux:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Install dependencies
+      run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev
+
+    - name: linux-linux
+      run: |
+        ./dependencies.sh && ./build.sh -t -d -r
+
+    - name: Tests
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest

CMakeLists.txt

@@ -44,10 +44,10 @@ if (RELEASE)
     if (ANDROID)
         # GOOGLE!! (Release is not a thing pos ndk 23 apparently..)
         add_compile_definitions(BUILD_TYPE="MinSizeRel")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-trapping-math -fno-rounding-math -fno-signed-zeros -funsafe-math-optimizations")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-trapping-math -fno-rounding-math -fno-signed-zeros")
     else()
         add_compile_definitions(BUILD_TYPE="Release")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-trapping-math -fno-rounding-math -fno-signaling-nans -fno-signed-zeros -funsafe-math-optimizations")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-trapping-math -fno-rounding-math -fno-signaling-nans -fno-signed-zeros")
     endif()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -O3")
 
@@ -184,6 +184,8 @@ IF (TEST_SUITE)
             "src/World/mapFile.cpp"
         )
 
+        target_compile_definitions(testSuite PUBLIC GLSL_VERSION="330")
+
         target_link_libraries(testSuite stduuid zlibstatic freetype glm)
 
         include(CTest)

demo/desktop/perlinWorld/sfml/sfmlPerlinWorld.cpp

@@ -44,15 +44,16 @@ using namespace std::chrono;
 const int resX = 1000;
 const int resY = 1000;
 const float MAX_SPEED = 1.0/60.0;
-const unsigned MAX_THREADS = 8;
+const unsigned MAX_THREADS = 0;
 
 // for smoothing delta numbers
 uint8_t frameId = 0;
 double deltas[60];
 
 bool debug = false;
 
-const double deltaPhysics = 1.0/900.0;
+const double deltaPhysics = 1.0/(900.0);
+const unsigned subSamples = 1;
 
 using Hop::Object::Component::cTransform;
 using Hop::Object::Component::cPhysics;
@@ -176,7 +177,6 @@ int main(int argc, char ** argv)
   // setup physics system
   sPhysics & physics = manager.getSystem<sPhysics>();
   physics.setTimeStep(deltaPhysics);
-  physics.setGravity(9.81);
 
   sCollision & collisions = manager.getSystem<sCollision>();
 
@@ -185,7 +185,7 @@ int main(int argc, char ** argv)
   auto res = std::make_unique<Hop::System::Physics::SpringDashpot>
   (
       deltaPhysics*10.0,
-      0.66,
+      0.5,
       0.0
   );
 
@@ -201,15 +201,17 @@ int main(int argc, char ** argv)
 
   console.luaStore(&luaStore);
 
-  console.runFile("test.lua");
+  console.runFile("tests/circles.lua");
   std::string status = console.luaStatus();
   if (status != "LUA_OK") { WARN(status) >> log; }
 
 
-  physics.stabaliseObjectParameters(&manager);
+  //physics.stabaliseObjectParameters(&manager);
 
   bool refreshObjectShaders = true;
 
+  bool paused = true;
+
   while (window.isOpen())
   {
 
@@ -239,40 +241,40 @@ int main(int argc, char ** argv)
         workers.joinThread();
         INFO("Thread: "+std::to_string(workers.size())) >> log;
       }
-      if (event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Space)
-      {
-        posX = 0.0; posY = 0.0;
-      }
 
       if (event.type == sf::Event::MouseWheelScrolled)
       {
         double z = event.mouseWheelScroll.delta;
         camera.incrementZoom(z);
       }
+      if (event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Space)
+      {
+        paused = !paused;
+      }
     }
 
     if ( sf::Keyboard::isKeyPressed(sf::Keyboard::W))
     {
 
-        posY += MAX_SPEED;
+        posY += MAX_SPEED/camera.getZoomLevel();
 
     }
     if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
     {
 
-        posY -= MAX_SPEED;
+        posY -= MAX_SPEED/camera.getZoomLevel();
 
     }
     if (sf::Keyboard::isKeyPressed(sf::Keyboard::A))
     {
 
-        posX -= MAX_SPEED;
+        posX -= MAX_SPEED/camera.getZoomLevel();
 
     }
     if (sf::Keyboard::isKeyPressed(sf::Keyboard::D))
     {
 
-        posX += MAX_SPEED;
+        posX += MAX_SPEED/camera.getZoomLevel();
 
     }
 
@@ -287,17 +289,25 @@ int main(int argc, char ** argv)
 
     collisions.centreOn(world.get()->getMapCenter());
 
-    if (workers.size() > 1)
+    if (!paused)
     {
-      collisions.update(&manager, world.get(),&workers);
-    }
-    else
-    {
-      collisions.update(&manager, world.get());
+      for (unsigned k = 0 ; k < subSamples; k++)
+      {
+        if (workers.size() > 1)
+        {
+          collisions.update(&manager, world.get(),&workers);
+        }
+        else
+        {
+          collisions.update(&manager, world.get());
+        }
+
+        physics.gravityForce(&manager,9.81,0.0,-1.0);
+
+        physics.update(&manager);
+      }
     }
 
-    physics.update(&manager);
-
     tp1 = high_resolution_clock::now();
 
     tr0 = high_resolution_clock::now();
@@ -309,7 +319,24 @@ int main(int argc, char ** argv)
     rendering.update(&manager, &shaderPool, refreshObjectShaders);
     refreshObjectShaders = false;
 
-    rendering.draw(&shaderPool);
+    rendering.draw(&shaderPool); 
+
+    auto objects = manager.getObjects();  
+
+    auto citer = objects.cbegin();
+    auto cend = objects.cend();
+
+    while (citer != cend)
+    {
+      if (manager.hasComponent<cCollideable>(citer->first))
+      {
+        
+        cCollideable & c = manager.getComponent<cCollideable>(citer->first);
+
+        c.mesh.drawDebug(camera.getVP());
+      }
+      citer++;
+    }
 
     tr1 = high_resolution_clock::now();
 

demo/desktop/perlinWorld/standalone/perlinWorld.cpp

@@ -174,7 +174,7 @@ int main(int argc, char ** argv)
 
     console.luaStore(&luaStore);
 
-    console.runFile("test.lua");
+    console.runFile("tests/circles.lua");
     std::string status = console.luaStatus();
     if (status != "LUA_OK") { WARN(status) >> log; }
 
@@ -200,6 +200,8 @@ int main(int argc, char ** argv)
 
         collisions.update(&manager, world.get());
 
+        physics.gravityForce(&manager,9.81,0.0,-1.0);
+
         physics.update(&manager);
 
         tp1 = high_resolution_clock::now();