Moved checkcollide methods in Object

diff --git a/Source/Game.hpp b/Source/Game.hpp
index 32f094d9cddfaae6fbe41e342b4bb67a62b3b25b..48f51f9eeacc1b4ba325a7bcd0f5cbeabf4232bc 100644 (file)
--- a/Source/Game.hpp
+++ b/Source/Game.hpp
@@ -150,9 +150,6 @@ void TickOnce();
 void TickOnceAfter();
 void SetUpLighting();
 GLvoid ReSizeGLScene(float fov, float near);
-int checkcollide(XYZ startpoint, XYZ endpoint);
-int checkcollide(XYZ startpoint, XYZ endpoint, int what);
-int checkcollide(XYZ startpoint, XYZ endpoint, float minx, float miny, float minz, float maxx, float maxy, float maxz, int what);
 
 void fireSound(int sound = fireendsound);
 

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index fa7da1ccfa1fb8dd7ba17aa51cea38abbee05885..fa679481354152607426bc7c50d8a8ff62254727 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -421,9 +421,9 @@ int Game::DrawGLScene(StereoSide side)
                         checkpoint.y += 1;
                         int i = -1;
                         if (Person::players[k]->occluded != 0)
-                            i = checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
+                            i = Object::checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
                         if (i == -1)
-                            i = checkcollide(viewer, checkpoint);
+                            i = Object::checkcollide(viewer, checkpoint);
                         if (i != -1) {
                             Person::players[k]->occluded += 1;
                             Person::players[k]->lastoccluded = i;
@@ -485,18 +485,21 @@ int Game::DrawGLScene(StereoSide side)
                     checkpoint = DoRotation(Person::players[k]->skeleton.joints[fabs(Random() % Person::players[k]->skeleton.joints.size())].position, 0, Person::players[k]->yaw, 0) * Person::players[k]->scale + Person::players[k]->coords;
                     checkpoint.y += 1;
                     int i = -1;
-                    if (Person::players[k]->occluded != 0)
-                        i = checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
-                    if (i == -1)
-                        i = checkcollide(viewer, checkpoint);
+                    if (Person::players[k]->occluded != 0) {
+                        i = Object::checkcollide(viewer, checkpoint, Person::players[k]->lastoccluded);
+                    }
+                    if (i == -1) {
+                        i = Object::checkcollide(viewer, checkpoint);
+                    }
                     if (i != -1) {
                         Person::players[k]->occluded += 1;
                         Person::players[k]->lastoccluded = i;
                     } else {
                         Person::players[k]->occluded = 0;
                     }
-                    if (Person::players[k]->occluded < 25)
+                    if (Person::players[k]->occluded < 25) {
                         Person::players[k]->DrawSkeleton();
+                    }
                 }
             }
         }

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index e4fb6401d5b9cb5a8a883da45f34e476fe764095..0690acd3da0158fe9c327fd74ba61d5017ea1fd9 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -418,70 +418,6 @@ int findPathDist(int start, int end)
     return smallestcount;
 }
 
-int Game::checkcollide(XYZ startpoint, XYZ endpoint)
-{
-    float minx, minz, maxx, maxz, miny, maxy;
-
-    minx = min(startpoint.x, endpoint.x) - 1;
-    miny = min(startpoint.y, endpoint.y) - 1;
-    minz = min(startpoint.z, endpoint.z) - 1;
-    maxx = max(startpoint.x, endpoint.x) + 1;
-    maxy = max(startpoint.y, endpoint.y) + 1;
-    maxz = max(startpoint.z, endpoint.z) + 1;
-
-    for (int i = 0; i < Object::objects.size(); i++) {
-        if (checkcollide(startpoint, endpoint, i, minx, miny, minz, maxx, maxy, maxz) != -1) {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-int Game::checkcollide(XYZ startpoint, XYZ endpoint, int what)
-{
-    float minx, minz, maxx, maxz, miny, maxy;
-
-    minx = min(startpoint.x, endpoint.x) - 1;
-    miny = min(startpoint.y, endpoint.y) - 1;
-    minz = min(startpoint.z, endpoint.z) - 1;
-    maxx = max(startpoint.x, endpoint.x) + 1;
-    maxy = max(startpoint.y, endpoint.y) + 1;
-    maxz = max(startpoint.z, endpoint.z) + 1;
-
-    return checkcollide(startpoint, endpoint, what, minx, miny, minz, maxx, maxy, maxz);
-}
-
-int Game::checkcollide(XYZ startpoint, XYZ endpoint, int what, float minx, float miny, float minz, float maxx, float maxy, float maxz)
-{
-    XYZ colpoint, colviewer, coltarget;
-
-    if (what == 1000) {
-        if (terrain.lineTerrain(startpoint, endpoint, &colpoint) != -1) {
-            return what;
-        }
-    } else {
-        if (     Object::objects[what]->position.x > minx - Object::objects[what]->model.boundingsphereradius &&
-                 Object::objects[what]->position.x < maxx + Object::objects[what]->model.boundingsphereradius &&
-                 Object::objects[what]->position.y > miny - Object::objects[what]->model.boundingsphereradius &&
-                 Object::objects[what]->position.y < maxy + Object::objects[what]->model.boundingsphereradius &&
-                 Object::objects[what]->position.z > minz - Object::objects[what]->model.boundingsphereradius &&
-                 Object::objects[what]->position.z < maxz + Object::objects[what]->model.boundingsphereradius) {
-            if (     Object::objects[what]->type != treeleavestype &&
-                     Object::objects[what]->type != bushtype &&
-                     Object::objects[what]->type != firetype) {
-                colviewer = startpoint;
-                coltarget = endpoint;
-                if (Object::objects[what]->model.LineCheck(&colviewer, &coltarget, &colpoint, &Object::objects[what]->position, &Object::objects[what]->yaw) != -1) {
-                    return what;
-                }
-            }
-        }
-    }
-
-    return -1;
-}
-
 void Setenvironment(int which)
 {
     LOGFUNC;
@@ -2620,8 +2556,8 @@ void doAerialAcrobatics()
                                         if (whichhit != -1) {
                                             if (whichhit != -1 && Person::players[k]->animTarget != jumpupanim && Person::players[k]->animTarget != jumpdownanim)
                                                 Person::players[k]->collided = 1;
-                                            if (checkcollide(lowpoint7, lowpointtarget7) == -1)
-                                                if (checkcollide(lowpoint6, lowpointtarget6) == -1)
+                                            if (Object::checkcollide(lowpoint7, lowpointtarget7) == -1)
+                                                if (Object::checkcollide(lowpoint6, lowpointtarget6) == -1)
                                                     if (     Object::objects[i]->model.LineCheckPossible(&lowpoint2, &lowpointtarget2,
                                                              &colpoint, &Object::objects[i]->position, &Object::objects[i]->yaw) != -1 &&
                                                              Object::objects[i]->model.LineCheckPossible(&lowpoint3, &lowpointtarget3,
@@ -3639,7 +3575,7 @@ void doAI(unsigned i)
                                 if (distsq(&Person::players[i]->coords, &Person::players[j]->coords) < 400)
                                     if (normaldotproduct(Person::players[i]->facing, Person::players[j]->coords - Person::players[i]->coords) > 0)
                                         if (Person::players[j]->coords.y < Person::players[i]->coords.y + 5 || Person::players[j]->onterrain)
-                                            if (!Person::players[j]->isWallJump() && -1 == checkcollide(
+                                            if (!Person::players[j]->isWallJump() && -1 == Object::checkcollide(
                                                         DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)
                                                         *Person::players[i]->scale + Person::players[i]->coords,
                                                         DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)
@@ -3782,7 +3718,7 @@ void doAI(unsigned i)
                             if (abs(Random() % 2) || Animation::animations[Person::players[j]->animTarget].height != lowheight || j != 0)
                                 if (distsq(&Person::players[i]->coords, &Person::players[j]->coords) < 400)
                                     if (normaldotproduct(Person::players[i]->facing, Person::players[j]->coords - Person::players[i]->coords) > 0)
-                                        if ((-1 == checkcollide(
+                                        if ((-1 == Object::checkcollide(
                                                     DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*
                                                     Person::players[i]->scale + Person::players[i]->coords,
                                                     DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)*
@@ -3835,9 +3771,9 @@ void doAI(unsigned i)
                     test2.y += 5;
                     XYZ test = Person::players[i]->coords + Person::players[i]->facing;
                     test.y -= 10;
-                    j = checkcollide(test2, test, Person::players[i]->laststanding);
+                    j = Object::checkcollide(test2, test, Person::players[i]->laststanding);
                     if (j == -1)
-                        j = checkcollide(test2, test);
+                        j = Object::checkcollide(test2, test);
                     if (j == -1) {
                         Person::players[i]->velocity = 0;
                         Person::players[i]->setAnimation(Person::players[i]->getStop());
@@ -3921,7 +3857,7 @@ void doAI(unsigned i)
                     //TODO: factor out canSeePlayer()
                     if (distsq(&Person::players[i]->coords, &Person::players[0]->coords) < 400)
                         if (normaldotproduct(Person::players[i]->facing, Person::players[0]->coords - Person::players[i]->coords) > 0)
-                            if ((checkcollide(
+                            if ((Object::checkcollide(
                                         DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*
                                         Person::players[i]->scale + Person::players[i]->coords,
                                         DoRotation(Person::players[0]->jointPos(head), 0, Person::players[0]->yaw, 0)*
@@ -3995,7 +3931,7 @@ void doAI(unsigned i)
                 XYZ flatfacing = Person::players[Person::players[i]->ally]->coords;
                 facing.y += Person::players[i]->jointPos(head).y * Person::players[i]->scale;
                 flatfacing.y += Person::players[Person::players[i]->ally]->jointPos(head).y * Person::players[Person::players[i]->ally]->scale;
-                if (-1 != checkcollide(facing, flatfacing))
+                if (-1 != Object::checkcollide(facing, flatfacing))
                     Person::players[i]->lastseentime -= .1;
 
                 //no available ally, run back to player
@@ -4212,9 +4148,9 @@ void doAI(unsigned i)
                     test2.y += 5;
                     XYZ test = Person::players[i]->coords + Person::players[i]->facing;
                     test.y -= 10;
-                    j = checkcollide(test2, test, Person::players[i]->laststanding);
+                    j = Object::checkcollide(test2, test, Person::players[i]->laststanding);
                     if (j == -1)
-                        j = checkcollide(test2, test);
+                        j = Object::checkcollide(test2, test);
                     if (j == -1) {
                         Person::players[i]->velocity = 0;
                         Person::players[i]->setAnimation(Person::players[i]->getStop());
@@ -4380,7 +4316,7 @@ void doAI(unsigned i)
                 facing.y += Person::players[i]->jointPos(head).y * Person::players[i]->scale;
                 flatfacing.y += Person::players[0]->jointPos(head).y * Person::players[0]->scale;
                 if (Person::players[i]->occluded >= 2)
-                    if (-1 != checkcollide(facing, flatfacing)) {
+                    if (-1 != Object::checkcollide(facing, flatfacing)) {
                         if (!Person::players[i]->pause)
                             Person::players[i]->lastseentime -= .2;
                         if (Person::players[i]->lastseentime <= 0 &&
@@ -4401,7 +4337,7 @@ void doAI(unsigned i)
             if (Person::players[0]->coords.y > terrain.getHeight(Person::players[0]->coords.x, Person::players[0]->coords.z) + 10) {
                 XYZ test = Person::players[0]->coords;
                 test.y -= 40;
-                if (-1 == checkcollide(Person::players[0]->coords, test))
+                if (-1 == Object::checkcollide(Person::players[0]->coords, test))
                     Person::players[i]->stunned = 1;
             }
         //stunned
@@ -5329,7 +5265,7 @@ void Game::Tick()
                                                                 distsq(&Person::players[i]->coords, &Person::players[j]->coords) < 100 &&
                                                                 distsq(&Person::players[i]->coords, &Person::players[j]->coords) > 1.5 &&
                                                                 !Person::players[j]->skeleton.free &&
-                                                                -1 == checkcollide(DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)*Person::players[j]->scale + Person::players[j]->coords, DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*Person::players[i]->scale + Person::players[i]->coords)) {
+                                                                -1 == Object::checkcollide(DoRotation(Person::players[j]->jointPos(head), 0, Person::players[j]->yaw, 0)*Person::players[j]->scale + Person::players[j]->coords, DoRotation(Person::players[i]->jointPos(head), 0, Person::players[i]->yaw, 0)*Person::players[i]->scale + Person::players[i]->coords)) {
                                                             if (!Person::players[i]->isFlip()) {
                                                                 Person::players[i]->throwtogglekeydown = 1;
                                                                 Person::players[i]->victim = Person::players[j];

diff --git a/Source/Objects/Object.cpp b/Source/Objects/Object.cpp
index 3e1e100eaffb5b7d30942ec6dfa18d58a1f2eb8f..1189f365243c75a0fdb33193a35f599313c5213b 100644 (file)
--- a/Source/Objects/Object.cpp
+++ b/Source/Objects/Object.cpp
@@ -814,6 +814,70 @@ void Object::DoShadows()
     }
 }
 
+int Object::checkcollide(XYZ startpoint, XYZ endpoint)
+{
+    float minx, minz, maxx, maxz, miny, maxy;
+
+    minx = min(startpoint.x, endpoint.x) - 1;
+    miny = min(startpoint.y, endpoint.y) - 1;
+    minz = min(startpoint.z, endpoint.z) - 1;
+    maxx = max(startpoint.x, endpoint.x) + 1;
+    maxy = max(startpoint.y, endpoint.y) + 1;
+    maxz = max(startpoint.z, endpoint.z) + 1;
+
+    for (int i = 0; i < objects.size(); i++) {
+        if (checkcollide(startpoint, endpoint, i, minx, miny, minz, maxx, maxy, maxz) != -1) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+int Object::checkcollide(XYZ startpoint, XYZ endpoint, int what)
+{
+    float minx, minz, maxx, maxz, miny, maxy;
+
+    minx = min(startpoint.x, endpoint.x) - 1;
+    miny = min(startpoint.y, endpoint.y) - 1;
+    minz = min(startpoint.z, endpoint.z) - 1;
+    maxx = max(startpoint.x, endpoint.x) + 1;
+    maxy = max(startpoint.y, endpoint.y) + 1;
+    maxz = max(startpoint.z, endpoint.z) + 1;
+
+    return checkcollide(startpoint, endpoint, what, minx, miny, minz, maxx, maxy, maxz);
+}
+
+int Object::checkcollide(XYZ startpoint, XYZ endpoint, int what, float minx, float miny, float minz, float maxx, float maxy, float maxz)
+{
+    XYZ colpoint, colviewer, coltarget;
+
+    if (what == 1000) {
+        if (terrain.lineTerrain(startpoint, endpoint, &colpoint) != -1) {
+            return what;
+        }
+    } else {
+        if (     objects[what]->position.x > minx - objects[what]->model.boundingsphereradius &&
+                 objects[what]->position.x < maxx + objects[what]->model.boundingsphereradius &&
+                 objects[what]->position.y > miny - objects[what]->model.boundingsphereradius &&
+                 objects[what]->position.y < maxy + objects[what]->model.boundingsphereradius &&
+                 objects[what]->position.z > minz - objects[what]->model.boundingsphereradius &&
+                 objects[what]->position.z < maxz + objects[what]->model.boundingsphereradius) {
+            if (     objects[what]->type != treeleavestype &&
+                     objects[what]->type != bushtype &&
+                     objects[what]->type != firetype) {
+                colviewer = startpoint;
+                coltarget = endpoint;
+                if (objects[what]->model.LineCheck(&colviewer, &coltarget, &colpoint, &objects[what]->position, &objects[what]->yaw) != -1) {
+                    return what;
+                }
+            }
+        }
+    }
+
+    return -1;
+}
+
 //~ Object::~Objects()
 //~ {
     //~ boxtextureptr.destroy();

diff --git a/Source/Objects/Object.hpp b/Source/Objects/Object.hpp
index a6c4f16a64ef921e9437e65970f8b563b6289907..a9a4318213584f8832efd1f2ada2d06f4498da48 100644 (file)
--- a/Source/Objects/Object.hpp
+++ b/Source/Objects/Object.hpp
@@ -98,6 +98,8 @@ public:
     static void Draw();
     static void DoShadows();
     static void DoStuff();
+    static int checkcollide(XYZ startpoint, XYZ endpoint);
+    static int checkcollide(XYZ startpoint, XYZ endpoint, int what);
 
 private:
     void handleFire();
@@ -105,6 +107,7 @@ private:
     void draw();
     void drawSecondPass();
     void addToTerrain(unsigned id);
+    static int checkcollide(XYZ startpoint, XYZ endpoint, int what, float minx, float miny, float minz, float maxx, float maxy, float maxz);
 };
 
 #endif