From 4595e1f6431813f4b55ab0a412d9ed03d0dd965d Mon Sep 17 00:00:00 2001
From: Allanis <allanis.saracraft.studios@gmail.com>
Date: Sun, 19 Nov 2017 12:37:19 +0000
Subject: [PATCH] [Change] Just messing with a few values. Put some space
 between the other actors.

---
 src/main.cpp      | 8 ++++----
 src/ship.cpp      | 2 +-
 src/ship_type.cpp | 2 +-
 src/space.cpp     | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ca85ebd..19e5b57 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -190,7 +190,7 @@ void L3D::MainLoop(void) {
   player = new Player(ShipType::SLEEK);
   player->SetLabel("Me");
   player->SetFrame(earth_frame);
-  player->SetPosition(vector3d(100, 0, 0));
+  player->SetPosition(vector3d(0, 0, 8000000.0));
   Space::AddBody(player);
 
   for(int i = 0; i < 4; i++) {
@@ -199,7 +199,7 @@ void L3D::MainLoop(void) {
     snprintf(buf, sizeof(buf), "X%c-0%02d", "A"+i, i);
     body->SetLabel(buf);
     body->SetFrame(earth_frame);
-    body->SetPosition(vector3d(i*2000, 0, -400));
+    body->SetPosition(vector3d(i*2000, 0, 8000400));
     Space::AddBody(body);
   }
 
@@ -207,13 +207,13 @@ void L3D::MainLoop(void) {
     SpaceStation* body = new SpaceStation();
     body->SetLabel("Some Back Country Joint");
     body->SetFrame(earth_frame);
-    body->SetPosition(vector3d(0, 0, 600));
+    body->SetPosition(vector3d(0, 0, 7999400));
     Space::AddBody(body);
   }
 
   Planet* planet = new Planet(StarSystem::SBody::SUBTYPE_PLANET_INDIGENOUS_LIFE);
   planet->SetLabel("Earth");
-  planet->SetPosition(vector3d(0, 0, -8000000.0));
+  planet->SetPosition(vector3d(0, 0, 0));
   planet->SetFrame(earth_frame);
   Space::AddBody(planet);
 
diff --git a/src/ship.cpp b/src/ship.cpp
index cb56faa..23e9a14 100644
--- a/src/ship.cpp
+++ b/src/ship.cpp
@@ -120,7 +120,7 @@ void Ship::TimeStepUpdate(const float timeStep) {
   }
 
   if(m_wheelTransition != 0.0f) {
-    m_wheelState += m_wheelTransition*timeStep*0.001;
+    m_wheelState += m_wheelTransition*timeStep;
     m_wheelState = CLAMP(m_wheelState, 0, 1);
     if((m_wheelState == 0) || (m_wheelState == 1)) m_wheelTransition = 0;
   }
diff --git a/src/ship_type.cpp b/src/ship_type.cpp
index f2870b3..a757817 100644
--- a/src/ship_type.cpp
+++ b/src/ship_type.cpp
@@ -7,7 +7,7 @@ const ShipType ShipType::types[] = {
      * Sirius corporation make a range of lovely ships!
      */
     "Sirius Interdictor", 61,
-    { 1e8, -1e8, 1e7, -1e6, -1e7, 1e7 },
+    { 4e8, -4e8, 1e8, -1e8, -1e8, 1e8 },
     1e7,
     {
       { vector3f(0, -0.5, 0), vector3f(0, 0, -1) },
diff --git a/src/space.cpp b/src/space.cpp
index 6d3d290..488e196 100644
--- a/src/space.cpp
+++ b/src/space.cpp
@@ -149,17 +149,18 @@ static bool _OnCollision(dGeomID g1, dGeomID g2, Object* o1, Object* o2,
 
 static void nearCallback(void* data, dGeomID oO, dGeomID o1) {
   /* Create an array of dContact objects to hold the contact joints. */
-  static const int MAX_CONTACTS = 10;
+  static const int MAX_CONTACTS = 20;
   dContact contact[MAX_CONTACTS];
 
   for(int i = 0; i < MAX_CONTACTS; i++) {
     contact[i].surface.mode       = dContactBounce;
     contact[i].surface.mu         = 0;
     contact[i].surface.mu2        = 0;
-    contact[i].surface.bounce     = 0.5;
+    contact[i].surface.bounce     = 0.1;
     contact[i].surface.bounce_vel = 0.1;
   }
   if(int numc = dCollide(oO, o1, MAX_CONTACTS, &contact[0].geom, sizeof(dContact))) {
+    printf("%d contacts\n", numc);
     Object* po1 = static_cast<Object*>(dGeomGetData(oO));
     Object* po2 = static_cast<Object*>(dGeomGetData(o1));
     if(!_OnCollision(oO, o1, po1, po2, numc, contact)) return;