Fixed TR3 level loader

ChangeLog.md

@@ -8,6 +8,7 @@
     * Removed color definitions in global.h
     * Font interface now using glm::vec4 float colors
     * Hard-coded controller mapping now supports all available ActionEvents
+    * Fixed TR3 level loading. Only some levels with invalid SoundSources still crash.
 
     [ 20140305 ]
     * SoundAL now has more useful error message output.

include/loader/LoaderTR2.h

@@ -26,6 +26,9 @@ class LoaderTR2 : public Loader {
     virtual void loadRoomStaticMeshes(std::vector<StaticModel*>& staticModels);
     virtual void loadRoomDataEnd(int16_t& alternateRoom, unsigned int& roomFlags);
     virtual void loadRoomVertex(RoomVertexTR2& vert);
+    virtual void loadRoomMesh(std::vector<IndexedRectangle>& rectangles,
+                              std::vector<IndexedRectangle>& triangles,
+                              uint16_t& numRectangles, uint16_t& numTriangles);
     virtual void loadRooms();
     virtual void loadFloorData();
     virtual void loadMeshes();

include/loader/LoaderTR3.h

@@ -17,6 +17,9 @@ class LoaderTR3 : public LoaderTR2 {
   protected:
     virtual void loadRoomLights();
     virtual void loadRoomDataEnd(int16_t& alternateRoom, unsigned int& roomFlags);
+    virtual void loadRoomMesh(std::vector<IndexedRectangle>& rectangles,
+                              std::vector<IndexedRectangle>& triangles,
+                              uint16_t& numRectangles, uint16_t& numTriangles);
 };
 
 #endif

src/loader/LoaderTR2.cpp

@@ -255,6 +255,37 @@ void LoaderTR2::loadRoomVertex(RoomVertexTR2& vert) {
     vert.light2 = file.read16();
 }
 
+void LoaderTR2::loadRoomMesh(std::vector<IndexedRectangle>& rectangles,
+                             std::vector<IndexedRectangle>& triangles,
+                             uint16_t& numRectangles, uint16_t& numTriangles) {
+    numRectangles = file.readU16();
+    for (unsigned int r = 0; r < numRectangles; r++) {
+        // Indices into the vertex list read just before
+        uint16_t vertex1 = file.readU16();
+        uint16_t vertex2 = file.readU16();
+        uint16_t vertex3 = file.readU16();
+        uint16_t vertex4 = file.readU16();
+
+        // Index into the object-texture list
+        uint16_t texture = file.readU16();
+
+        rectangles.emplace_back(texture, vertex1, vertex2, vertex3, vertex4);
+    }
+
+    numTriangles = file.readU16();
+    for (unsigned int t = 0; t < numTriangles; t++) {
+        // Indices into the room vertex list
+        uint16_t vertex1 = file.readU16();
+        uint16_t vertex2 = file.readU16();
+        uint16_t vertex3 = file.readU16();
+
+        // Index into the object-texture list
+        uint16_t texture = file.readU16();
+
+        triangles.emplace_back(texture, vertex1, vertex2, vertex3);
+    }
+}
+
 void LoaderTR2::loadRooms() {
     uint16_t numRooms = file.readU16();
     for (unsigned int i = 0; i < numRooms; i++) {
@@ -307,34 +338,10 @@ void LoaderTR2::loadRooms() {
         bbox[0] += pos;
         bbox[1] += pos;
 
-        uint16_t numRectangles = file.readU16();
         std::vector<IndexedRectangle> rectangles;
-        for (unsigned int r = 0; r < numRectangles; r++) {
-            // Indices into the vertex list read just before
-            uint16_t vertex1 = file.readU16();
-            uint16_t vertex2 = file.readU16();
-            uint16_t vertex3 = file.readU16();
-            uint16_t vertex4 = file.readU16();
-
-            // Index into the object-texture list
-            uint16_t texture = file.readU16();
-
-            rectangles.emplace_back(texture, vertex1, vertex2, vertex3, vertex4);
-        }
-
-        uint16_t numTriangles = file.readU16();
         std::vector<IndexedRectangle> triangles;
-        for (unsigned int t = 0; t < numTriangles; t++) {
-            // Indices into the room vertex list
-            uint16_t vertex1 = file.readU16();
-            uint16_t vertex2 = file.readU16();
-            uint16_t vertex3 = file.readU16();
-
-            // Index into the object-texture list
-            uint16_t texture = file.readU16();
-
-            triangles.emplace_back(texture, vertex1, vertex2, vertex3);
-        }
+        uint16_t numRectangles, numTriangles;
+        loadRoomMesh(rectangles, triangles, numRectangles, numTriangles);
 
         uint16_t numSprites = file.readU16();
         std::vector<RoomSprite*> roomSprites;

src/loader/LoaderTR3.cpp

@@ -83,3 +83,34 @@ void LoaderTR3::loadRoomDataEnd(int16_t& alternateRoom, unsigned int& roomFlags)
     // TODO store room-light color (?) somewhere
 }
 
+void LoaderTR3::loadRoomMesh(std::vector<IndexedRectangle>& rectangles,
+                             std::vector<IndexedRectangle>& triangles,
+                             uint16_t& numRectangles, uint16_t& numTriangles) {
+    numRectangles = file.readU16();
+    for (unsigned int r = 0; r < numRectangles; r++) {
+        // Indices into the vertex list read just before
+        uint16_t vertex1 = file.readU16();
+        uint16_t vertex2 = file.readU16();
+        uint16_t vertex3 = file.readU16();
+        uint16_t vertex4 = file.readU16();
+
+        // Index into the object-texture list
+        uint16_t texture = file.readU16() & 0x7FFF;
+
+        rectangles.emplace_back(texture, vertex1, vertex2, vertex3, vertex4);
+    }
+
+    numTriangles = file.readU16();
+    for (unsigned int t = 0; t < numTriangles; t++) {
+        // Indices into the room vertex list
+        uint16_t vertex1 = file.readU16();
+        uint16_t vertex2 = file.readU16();
+        uint16_t vertex3 = file.readU16();
+
+        // Index into the object-texture list
+        uint16_t texture = file.readU16() & 0x7FFF;
+
+        triangles.emplace_back(texture, vertex1, vertex2, vertex3);
+    }
+}
+

utils/tombraider.bfft

@@ -22,7 +22,7 @@ struct face4_t {
      */
     unsigned 16 little texture;
 
-    summary vertices[0], " - ", vertices[1], " - ", vertices[2], " - ", vertices[3];
+    summary texture, ": ", vertices[0], " - ", vertices[1], " - ", vertices[2], " - ", vertices[3];
 }
 
 // Triangular faces
@@ -53,7 +53,7 @@ struct room_vertex_t {
     vertex_t vertex;
 
     /*
-     * Room lighting is internal vertex lighting, except for except
+     * Room lighting is internal vertex lighting, except
      * for necessarily external sources like flares.
      * Room ambient lights and point sources are ignored.
      */