- fix rendermodel normals generation

Author: SoapyMan

DriverLevelTool/driver_routines/models.cpp

@@ -354,9 +354,9 @@ int decode_poly(const char* polyList, dpoly_t* out)
 			POLYFT3* pft3 = (POLYFT3*)polyList;
 
 			*(uint*)out->vindices = *(uint*)&pft3->v0;
-			*(ushort*)out->uv[0] = *(uint*)&pft3->uv0;
-			*(ushort*)out->uv[1] = *(uint*)&pft3->uv1;
-			*(ushort*)out->uv[2] = *(uint*)&pft3->uv2;
+			*(ushort*)out->uv[0] = *(ushort*)&pft3->uv0;
+			*(ushort*)out->uv[1] = *(ushort*)&pft3->uv1;
+			*(ushort*)out->uv[2] = *(ushort*)&pft3->uv2;
 
 			if(ptype != 10)
 				*(uint*)out->color = *(uint*)&pft3->color;
@@ -377,18 +377,18 @@ int decode_poly(const char* polyList, dpoly_t* out)
 			POLYFT4* pft4 = (POLYFT4*)polyList;
 
 			*(uint*)out->vindices = *(uint*)&pft4->v0;
-			*(ushort*)out->uv[0] = *(uint*)&pft4->uv0;
-			*(ushort*)out->uv[1] = *(uint*)&pft4->uv1;
-			*(ushort*)out->uv[2] = *(uint*)&pft4->uv2;
-			*(ushort*)out->uv[3] = *(uint*)&pft4->uv3;
-
+			*(ushort*)out->uv[0] = *(ushort*)&pft4->uv0;
+			*(ushort*)out->uv[1] = *(ushort*)&pft4->uv1;
+			*(ushort*)out->uv[2] = *(ushort*)&pft4->uv2;
+			*(ushort*)out->uv[3] = *(ushort*)&pft4->uv3;
+			
 			if(ptype != 11)
 				*(uint*)out->color = *(uint*)&pft4->color;
 
 			out->page = pft4->texture_set;
 			out->detail = pft4->texture_id;
 
-			//SwapValues(out->vindices[2], out->vindices[3]);
+			//SwapValues(out->uv[2], out->uv[3]);
 
 			out->flags = FACE_IS_QUAD | FACE_TEXTURED;
 
@@ -400,9 +400,9 @@ int decode_poly(const char* polyList, dpoly_t* out)
 
 			*(uint*)out->vindices = *(uint*)&pgt3->v0;
 			*(uint*)out->nindices = *(uint*)&pgt3->n0;
-			*(ushort*)out->uv[0] = *(uint*)&pgt3->uv0;
-			*(ushort*)out->uv[1] = *(uint*)&pgt3->uv1;
-			*(ushort*)out->uv[2] = *(uint*)&pgt3->uv2;
+			*(ushort*)out->uv[0] = *(ushort*)&pgt3->uv0;
+			*(ushort*)out->uv[1] = *(ushort*)&pgt3->uv1;
+			*(ushort*)out->uv[2] = *(ushort*)&pgt3->uv2;
 
 			*(uint*)out->color = *(uint*)&pgt3->color;
 			out->page = pgt3->texture_set;
@@ -418,10 +418,10 @@ int decode_poly(const char* polyList, dpoly_t* out)
 
 			*(uint*)out->vindices = *(uint*)&pgt4->v0;
 			*(uint*)out->nindices = *(uint*)&pgt4->n0;
-			*(ushort*)out->uv[0] = *(uint*)&pgt4->uv0;
-			*(ushort*)out->uv[1] = *(uint*)&pgt4->uv1;
-			*(ushort*)out->uv[2] = *(uint*)&pgt4->uv2;
-			*(ushort*)out->uv[3] = *(uint*)&pgt4->uv3;
+			*(ushort*)out->uv[0] = *(ushort*)&pgt4->uv0;
+			*(ushort*)out->uv[1] = *(ushort*)&pgt4->uv1;
+			*(ushort*)out->uv[2] = *(ushort*)&pgt4->uv2;
+			*(ushort*)out->uv[3] = *(ushort*)&pgt4->uv3;
 
 			*(uint*)out->color = *(uint*)&pgt4->color;
 			out->page = pgt4->texture_set;

DriverLevelTool/driver_routines/regions_d1.cpp

@@ -55,8 +55,8 @@ void CDriver1LevelRegion::LoadRegionData(IVirtualStream* pFile, Spool* spool)
 
 	char* packed_cell_pointers = new char[spool->cell_data_size[1] * SPOOL_CD_BLOCK_SIZE];
 
-	m_cellPointers = new ushort[m_owner->m_cell_objects_add[2]];
-	memset(m_cellPointers, 0xFF, sizeof(ushort) * m_owner->m_cell_objects_add[2]);
+	m_cellPointers = new ushort[m_owner->m_cell_objects_add[5]];
+	memset(m_cellPointers, 0xFF, sizeof(ushort) * m_owner->m_cell_objects_add[5]);
 
 	// read packed cell pointers
 	pFile->Seek(g_levInfo.spooldata_offset + cellPointersOffset * SPOOL_CD_BLOCK_SIZE, VS_SEEK_SET);

DriverLevelTool/driver_routines/regions_d2.cpp

@@ -70,8 +70,8 @@ void CDriver2LevelRegion::LoadRegionData(IVirtualStream* pFile, Spool* spool)
 
 	char* packed_cell_pointers = new char[spool->cell_data_size[1] * SPOOL_CD_BLOCK_SIZE];
 
-	m_cellPointers = new ushort[m_owner->m_cell_objects_add[2]];
-	memset(m_cellPointers, 0xFF, sizeof(ushort) * m_owner->m_cell_objects_add[2]);
+	m_cellPointers = new ushort[m_owner->m_cell_objects_add[5]];
+	memset(m_cellPointers, 0xFF, sizeof(ushort) * m_owner->m_cell_objects_add[5]);
 
 	// read packed cell pointers
 	pFile->Seek(g_levInfo.spooldata_offset + cellPointersOffset * SPOOL_CD_BLOCK_SIZE, VS_SEEK_SET);

DriverLevelTool/viewer/rendermodel.cpp

@@ -61,6 +61,10 @@ int FindGrVertexIndex(const DkList<vertexTuple_t>& whereFind, int flags, int ver
 			if (whereFind[i].normalIndex != normalIndex)
 				continue;
 		}
+		else
+		{
+			return -1;
+		}
 
 		if (flags & FACE_TEXTURED)
 		{
@@ -216,6 +220,7 @@ void CRenderModel::GenerateBuffers()
 				vertMap.flags = vflags;
 				vertMap.normalIndex = -1;
 				vertMap.vertexIndex = dec_face.vindices[VERT_IDX];
+				vertMap.uvs = *(ushort*)dec_face.uv[VERT_IDX];
 
 				// get the vertex
 				SVECTOR* vert = vertex_ref->pVertex(dec_face.vindices[VERT_IDX]);