- extend draw distance, turn trees to view

Author: SoapyMan

DriverLevelTool/driver_routines/d2_types.h

@@ -192,6 +192,7 @@ struct POLYGT4
 	CVECTOR color;
 };
 
+#if 0
 enum ModelFlags1	// collision flags?
 {
 	everything = 1,
@@ -231,6 +232,31 @@ enum ModelFlags2	// effect flags?
 	dontKnow15 = 16384, // ??? again: many sidewalks, some grass
 	sidewalk = 32768
 };
+#else
+enum ModelShapeFlags
+{
+	SHAPE_FLAG_SMASH_QUIET = 0x8,
+	SHAPE_FLAG_NOCOLLIDE = 0x10,
+	SHAPE_FLAG_SUBSURFACE = 0x80,		// grass, dirt, water
+	SHAPE_FLAG_ALLEYWAY = 0x400,	// alleyway
+	SHAPE_FLAG_SMASH_SPRITE = 0x4000,
+};
+
+enum ModelFlags2
+{
+	MODEL_FLAG_ANIMOBJ = 0x1,
+	MODEL_FLAG_MEDIAN = 0x20,
+	MODEL_FLAG_ALLEY = 0x80,
+	MODEL_FLAG_HASROOF = 0x100,
+	MODEL_FLAG_NOCOL_200 = 0x200,
+	MODEL_FLAG_BARRIER = 0x400,
+	MODEL_FLAG_SMASHABLE = 0x800,
+	MODEL_FLAG_LAMP = 0x1000,
+	MODEL_FLAG_TREE = 0x2000,
+	MODEL_FLAG_GRASS = 0x4000,
+	MODEL_FLAG_SIDEWALK = 0x8000,
+};
+#endif
 
 struct MODEL
 {

DriverLevelTool/viewer/rendermodel.cpp

@@ -235,8 +235,8 @@ void CRenderModel::GenerateBuffers()
 					UV_INFO uv = *(UV_INFO*)dec_face.uv[VERT_IDX];
 
 					// map to 0..1
-					newVert.tc_u = (uv.u + 0.5f) / 256.0f;		// do /2 and *2 as textures were already 4 bit
-					newVert.tc_v = (uv.v + 0.5f) / 256.0f;
+					newVert.tc_u = ((float)uv.u + 0.5f) / 256.0f;		// do /2 and *2 as textures were already 4 bit
+					newVert.tc_v = ((float)uv.v + 0.5f) / 256.0f;
 				}
 
 				index = vertMap.grVertexIndex = vertices.append(newVert);

DriverLevelTool/viewer/viewer.cpp

@@ -32,6 +32,7 @@
 	"	void main() {\n"\
 	"		vec4 lighting;\n"\
 	"		vec4 color = texture2D(s_texture, v_texcoord.xy);\n"\
+	"		if(color.r + color.g + color.b + color.a == 0.0f) discard;\n"\
 	"		lighting = vec4(color.rgb * u_ambientColor.rgb * u_ambientColor.a, color.a);\n"\
 	"		lighting.rgb += u_lightColor.rgb * u_lightColor.a * color.rgb * saturate(1.0 - dot(v_normal, u_lightDir));\n"\
 	"		fragColor = lighting;\n"\
@@ -241,7 +242,7 @@ void InitHWTexturePage(CTexturePage* tpage)
 	// FIXME: load indexes instead?
 
 	for (int i = 0; i < numDetails; i++)
-		tpage->ConvertIndexedTextureToRGBA(color_data, i, &bitmap.clut[i]);
+		tpage->ConvertIndexedTextureToRGBA(color_data, i, &bitmap.clut[i], false, false);
 
 	int tpageId = tpage->GetId();
 
@@ -259,7 +260,7 @@ void InitHWTexturePage(CTexturePage* tpage)
 
 			if (detail->extraCLUTs[pal])
 			{
-				tpage->ConvertIndexedTextureToRGBA(color_data, j, detail->extraCLUTs[pal]);
+				tpage->ConvertIndexedTextureToRGBA(color_data, j, detail->extraCLUTs[pal], false, false);
 				anyMatched = true;
 			}
 		}
@@ -296,7 +297,7 @@ void DrawLevelDriver2(const Vector3D& cameraPos)
 	CELL_ITERATOR ci;
 	PACKED_CELL_OBJECT* ppco;
 
-	int i = 441 * 2;
+	int i = 441 * 32;
 	int vloop = 0;
 	int hloop = 0;
 	int dir = 0;
@@ -313,7 +314,7 @@ void DrawLevelDriver2(const Vector3D& cameraPos)
 	// walk through all cells
 	while (i >= 0)
 	{
-		if (abs(hloop) + abs(vloop) < 64)
+		if (abs(hloop) + abs(vloop) < 256)
 		{
 			// clamped vis values
 			int vis_h = MIN(MAX(hloop, -9), 10);
@@ -348,14 +349,36 @@ void DrawLevelDriver2(const Vector3D& cameraPos)
 						continue;
 					}
 
+					ModelRef_t* ref = g_levModels.GetModelByIndex(co.type);
+					MODEL* model = ref->model;
+					
 					float cellRotationRad = -co.yang / 64.0f * PI_F * 2.0f;
 
+					bool isGround = false;
+					
+					if(model)
+					{
+						if(model->flags2 == MODEL_FLAG_TREE)
+						{
+							cellRotationRad = DEG2RAD(g_cameraAngles.y);
+						}
+
+						if ((model->shape_flags & (SHAPE_FLAG_SUBSURFACE | SHAPE_FLAG_ALLEYWAY)) ||
+							(model->flags2 & (MODEL_FLAG_SIDEWALK | MODEL_FLAG_GRASS)))
+						{
+							isGround = true;
+						}
+					}
+
 					Vector3D absCellPosition(co.pos.vx * EXPORT_SCALING, co.pos.vy * -EXPORT_SCALING, co.pos.vz * EXPORT_SCALING);
 					Matrix4x4 objectMatrix = translate(absCellPosition) * rotateY4(cellRotationRad);
 					GR_SetMatrix(MATRIX_WORLD, objectMatrix);
 					GR_UpdateMatrixUniforms();
 
-					ModelRef_t* ref = g_levModels.GetModelByIndex(co.type);
+					if(isGround)
+					{
+						
+					}
 
 					CRenderModel* renderModel = (CRenderModel*)ref->userData;
 
@@ -495,7 +518,7 @@ int ViewerMain(const char* filename)
 
 		GR_BeginScene();
 
-		GR_ClearColor(32, 32, 32);
+		GR_ClearColor(128, 158, 182);
 		GR_ClearDepth(1.0f);
 
 		// Control and map