- fix cell object Y flipping between D1 and D2

Author: SoapyMan

DriverLevelTool/driver_routines/regions_d2.cpp

@@ -655,7 +655,7 @@ bool CDriver2LevelMap::UnpackCellObject(CELL_OBJECT& co, PACKED_CELL_OBJECT* pco
 	co.pos.vz = nearCell.z + (((pco->pos.vz - nearCell.z) << 0x10) >> 0x10);
 
 	// cell height should be negated
-	co.pos.vy = -((pco->pos.vy << 0x10) >> 0x11);
+	co.pos.vy = ((pco->pos.vy << 0x10) >> 0x11);
 
 	co.yang = pco->value & 0x3f;
 	co.type = (pco->value >> 6) | ((pco->pos.vy & 1) << 10);

DriverLevelTool/exporter/export_regions.cpp

@@ -71,7 +71,7 @@ int ExportRegionDriver1(CDriver1LevelRegion* region, IVirtualStream* levelFileSt
 
 		while(co)
 		{
-			Vector3D absCellPosition(co->pos.vx * -EXPORT_SCALING, co->pos.vy * -EXPORT_SCALING, co->pos.vz * EXPORT_SCALING);
+			Vector3D absCellPosition(co->pos.vx * -EXPORT_SCALING, -co->pos.vy * -EXPORT_SCALING, co->pos.vz * EXPORT_SCALING);
 			float cellRotationRad = co->yang / 64.0f * PI_F * 2.0f;
 
 			ModelRef_t* ref = g_levModels.GetModelByIndex(co->type);
@@ -139,7 +139,7 @@ int ExportRegionDriver2(CDriver2LevelRegion* region, IVirtualStream* levelFileSt
 			CELL_OBJECT co;
 			CDriver2LevelMap::UnpackCellObject(co, pco, ci.nearCell);
 
-			Vector3D absCellPosition(co.pos.vx * -EXPORT_SCALING, co.pos.vy * EXPORT_SCALING, co.pos.vz * EXPORT_SCALING);
+			Vector3D absCellPosition(co.pos.vx * -EXPORT_SCALING, -co.pos.vy * EXPORT_SCALING, co.pos.vz * EXPORT_SCALING);
 			float cellRotationRad = co.yang / 64.0f * PI_F * 2.0f;
 
 			ModelRef_t* ref = g_levModels.GetModelByIndex(co.type);

DriverLevelTool/viewer/renderlevel.cpp

@@ -32,8 +32,8 @@ extern int g_cellsDrawDistance;
 
 //-----------------------------------------------------------------
 
-const float MODEL_LOD_HIGH_MIN_DISTANCE = 5.0f;
-const float MODEL_LOD_LOW_MIN_DISTANCE = 40.0f;
+const float MODEL_LOD_HIGH_MIN_DISTANCE = 1.0f;
+const float MODEL_LOD_LOW_MIN_DISTANCE = 5.0f;
 
 //-------------------------------------------------------
 // returns specific model or LOD model
@@ -49,13 +49,13 @@ ModelRef_t* GetModelCheckLods(int index, float distSqr)
 	ModelRef_t* retRef = baseRef;
 	if (baseRef->highDetailId != 0xFFFF)
 	{
-		if (distSqr < MODEL_LOD_HIGH_MIN_DISTANCE)
+		if (distSqr < MODEL_LOD_HIGH_MIN_DISTANCE * MODEL_LOD_HIGH_MIN_DISTANCE)
 			return g_levModels.GetModelByIndex(baseRef->highDetailId);
 	}
 
 	if (baseRef->lowDetailId != 0xFFFF)
 	{
-		if (distSqr > MODEL_LOD_HIGH_MIN_DISTANCE)
+		if (distSqr > MODEL_LOD_LOW_MIN_DISTANCE * MODEL_LOD_LOW_MIN_DISTANCE)
 			return g_levModels.GetModelByIndex(baseRef->lowDetailId);
 	}
 
@@ -242,6 +242,7 @@ void DrawLevelDriver2(const Vector3D& cameraPos, float cameraAngleY, const Volum
 		}
 
 		Vector3D absCellPosition = FromFixedVector(co.pos);
+		absCellPosition.y *= -1.0f;
 
 		float distanceFromCamera = lengthSqr(absCellPosition - cameraPos);
 
@@ -408,6 +409,8 @@ void DrawLevelDriver1(const Vector3D& cameraPos, float cameraAngleY, const Volum
 		}
 
 		Vector3D absCellPosition = FromFixedVector(pco->pos);
+		absCellPosition.y *= -1.0f;
+		
 		float distanceFromCamera = lengthSqr(absCellPosition - cameraPos);
 
 		ModelRef_t* ref = GetModelCheckLods(pco->type, distanceFromCamera);
@@ -436,9 +439,9 @@ void DrawLevelDriver1(const Vector3D& cameraPos, float cameraAngleY, const Volum
 		GR_UpdateMatrixUniforms();
 
 		if (g_nightMode)
-			CRenderModel::SetupLightingProperties(0.45f, 0.0f);
+			CRenderModel::SetupLightingProperties(0.25f, 0.0f);
 		else
-			CRenderModel::SetupLightingProperties(1.0f, 1.0f);
+			CRenderModel::SetupLightingProperties(0.55f, 0.55f);
 
 		CRenderModel* renderModel = (CRenderModel*)ref->userData;
 

DriverLevelTool/viewer/rendermodel.cpp

@@ -424,6 +424,7 @@ void CRenderModel::DrawModelCollisionBox(ModelRef_t* ref, const VECTOR_NOPAD& po
 	float objRotationRad = -rotation / 64.0f * PI_F * 2.0f;
 
 	Vector3D offset = FromFixedVector(position);
+	offset.y *= -1.0f;
 	Matrix4x4 world = translate(offset) * rotateY4(objRotationRad);
 
 	MODEL* model = ref->model;

DriverLevelTool/viewer/viewer.cpp

@@ -224,6 +224,7 @@ void RenderLevelView()
 	Volume frustumVolume;
 
 	// setup standard camera
+	CRenderModel::SetupModelShader();
 	SetupCameraViewAndMatrices(g_cameraPosition, g_cameraAngles, frustumVolume);
 
 	GR_SetDepth(1);
@@ -250,9 +251,9 @@ void RenderModelView()
 	AngleVectors(g_cameraAngles, &forward, &right);
 
 	// setup orbital camera
+	CRenderModel::SetupModelShader();
 	SetupCameraViewAndMatrices(-forward * g_cameraDistance, g_cameraAngles, frustumVolume);
 
-	CRenderModel::SetupModelShader();
 	CRenderModel::SetupLightingProperties(0.5f, 0.5f);
 
 	GR_SetDepth(1);