Changeset 985 for Daodan/src

Timestamp:

Mar 17, 2014, 3:08:55 AM (11 years ago)

Author:

alloc

Message:

Daodan: Added show_triggervolumes

Location:

Daodan/src/patches

Files:

• Patches.c (modified) (3 diffs)
• objt.h (modified) (2 diffs)

Daodan/src/patches/Patches.c

@@ -123 +123 @@
 int16_t ONICALL DD_COrTextArea_Resize(void* inTextArea, UUtRect* inBounds, int16_t inNumTextEntries) {
         if (inTextArea == COgCommandLine) {
-                inBounds->top -= 5;
+                inBounds->top -= 8;
         }
         return Oni_COrTextArea_Resize(inTextArea, inBounds, inNumTextEntries);
@@ -137 +137 @@
         OBJtOSD_TriggerVolume   *trigger_osd = &inOSD->osd.trigger_volume_osd;
         M3tPoint3D                              *points = trigger_osd->volume.worldPoints;
-        M3tPoint3D                              trigger_center = {0, 0, 0};
         UUtUns32                                shade = 0xFFFFFF;
 
@@ -166 +165 @@
         M3rGeom_Line_Light(points + 3, points + 7, shade);
         M3rGeom_Line_Light(points + 2, points + 6, shade);
-
-        for(itr = 0; itr < M3cNumBoundingPoints; itr++)
-        {
-                MUmVector_Add(trigger_center, trigger_center, points[itr]);
-        }
-
-        MUmVector_Scale(trigger_center, (1.0f / ((float) M3cNumBoundingPoints)));
 }
 

Daodan/src/patches/objt.h

@@ -4 +4 @@
 #define M3cNumBoundingPoints 8// Do not change without changing references below
 #define M3cNumBoundingFaces 6// Do not change without changing references below
-
-#define MUmVector_Add(dst, srca, srcb)\
-        do {(dst).x = (srca).x + (srcb).x;\
-        (dst).y = (srca).y + (srcb).y;\
-        (dst).z = (srca).z + (srcb).z; } while (0)
-
-#define MUmVector_Scale(vec,s)\
-        do {(vec).x*=(s); \
-        (vec).y*=(s); \
-        (vec).z*=(s); } while (0)
 
 typedef struct M3tPoint3D
@@ -78 +68 @@
         char exit_script[SLcScript_MaxNameLength];
 
-        char note[OBJcMaxNoteChars + 1];
+        // TODO: +1 in orig, why do we have to shift here?
+        char note[OBJcMaxNoteChars + 2];
 
         M3tPoint3D scale;