Added a helper for getting model triangle vertexes, mostly used in Decal for now.

[lugaru.git] / Source / Objects / Weapons.cpp

diff --git a/Source/Objects/Weapons.cpp b/Source/Objects/Weapons.cpp
index 1cd4cea3f93c21ed6f77eac182afbc06b9354226..1fe60115a6d969c5bd1a2c12350eb31eed0af809 100644 (file)
--- a/Source/Objects/Weapons.cpp
+++ b/Source/Objects/Weapons.cpp
@@ -622,10 +622,10 @@ void Weapon::doStuff(int i)
                             if (whichhit != -1) {
                                 hitsomething = 1;
                                 closestdistance = -1;
-                                closestswordpoint = colpoint; //(position+tippoint)/2;
-                                point[0] = DoRotation(Object::objects[k]->model.vertex[Object::objects[k]->model.Triangles[whichhit].vertex[0]], 0, Object::objects[k]->yaw, 0) + Object::objects[k]->position;
-                                point[1] = DoRotation(Object::objects[k]->model.vertex[Object::objects[k]->model.Triangles[whichhit].vertex[1]], 0, Object::objects[k]->yaw, 0) + Object::objects[k]->position;
-                                point[2] = DoRotation(Object::objects[k]->model.vertex[Object::objects[k]->model.Triangles[whichhit].vertex[2]], 0, Object::objects[k]->yaw, 0) + Object::objects[k]->position;
+                                closestswordpoint = colpoint;
+                                point[0] = DoRotation(Object::objects[k]->model.getTriangleVertex(whichhit, 0), 0, Object::objects[k]->yaw, 0) + Object::objects[k]->position;
+                                point[1] = DoRotation(Object::objects[k]->model.getTriangleVertex(whichhit, 1), 0, Object::objects[k]->yaw, 0) + Object::objects[k]->position;
+                                point[2] = DoRotation(Object::objects[k]->model.getTriangleVertex(whichhit, 2), 0, Object::objects[k]->yaw, 0) + Object::objects[k]->position;
                                 if (DistancePointLine(&closestswordpoint, &point[0], &point[1], &distance, &colpoint )) {
                                     if (distance < closestdistance || closestdistance == -1) {
                                         closestpoint = colpoint;