tweak: Disable test asset loading in release builds (#1485)

Author: xezon

Core/GameEngine/Include/Common/FileSystem.h

@@ -87,15 +87,17 @@ typedef FilenameList::iterator FilenameListIter;
 
 // LOAD_TEST_ASSETS automatically loads w3d assets from the TEST_W3D_DIR_PATH
 // without having to add an INI entry.
-///@todo this allows us to use the test art directory, it should be removed for FINAL release
+#if defined(RTS_DEBUG)
 #define LOAD_TEST_ASSETS 1
+#endif
+
 #ifdef LOAD_TEST_ASSETS
 	#define ROAD_DIRECTORY		"../TestArt/TestRoad/"
 	#define TEST_STRING				"***TESTING"
-// the following directories will be used to look for test art
-#define LOOK_FOR_TEST_ART
-#define TEST_W3D_DIR_PATH "../TestArt/"					///< .w3d files live here
-#define TEST_TGA_DIR_PATH "../TestArt/"		///< .tga texture files live here
+	// the following directories will be used to look for test art
+	#define LOOK_FOR_TEST_ART
+	#define TEST_W3D_DIR_PATH "../TestArt/"					///< .w3d files live here
+	#define TEST_TGA_DIR_PATH "../TestArt/"		///< .tga texture files live here
 #endif
 
 struct FileInfo {

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp

@@ -94,10 +94,10 @@ void W3DDefaultDraw::reactToTransformChange( const Matrix3D *oldMtx,
 																						 const Coord3D *oldPos,
 																						 Real oldAngle )
 {
-
+#ifdef LOAD_TEST_ASSETS
 	if( m_renderObject )
 		m_renderObject->Set_Transform( *getDrawable()->getTransformMatrix() );
-
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------

Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp

@@ -1251,15 +1251,18 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			break;
 	}
 
-	AsciiString modelName("No Model Name");
+	AsciiString modelName;
 	*scale = 1.0f;
-	Int i;
+
+#ifdef LOAD_TEST_ASSETS
 	char buffer[ _MAX_PATH ];
+
 	if (strncmp(TEST_STRING, pMapObj->getName().str(), strlen(TEST_STRING)) == 0)
 	{
 		/* Handle test art models here */
 		strcpy(buffer, pMapObj->getName().str());
 
+		Int i;
 		for (i=0; buffer[i]; i++) {
 			if (buffer[i] == '/') {
 				i++;
@@ -1268,7 +1271,9 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 		}
 		modelName = buffer+i;
 	}
-	else
+#endif
+
+	if (modelName.isEmpty())
 	{
 		modelName = "No Model Name"; // must be this while GDF exists (it's the default)
 		const ThingTemplate *tTemplate;
@@ -1281,8 +1286,8 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			modelName = getBestModelName(tTemplate, state);
 			*scale = tTemplate->getAssetScale();
 
-		}  // end if
-	}  // end else
+		}
+	}
 	return modelName;
 }
 

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp

@@ -94,10 +94,10 @@ void W3DDefaultDraw::reactToTransformChange( const Matrix3D *oldMtx,
 																						 const Coord3D *oldPos,
 																						 Real oldAngle )
 {
-
+#ifdef LOAD_TEST_ASSETS
 	if( m_renderObject )
 		m_renderObject->Set_Transform( *getDrawable()->getTransformMatrix() );
-
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp

@@ -1308,15 +1308,18 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			break;
 	}
 
-	AsciiString modelName("No Model Name");
+	AsciiString modelName;
 	*scale = 1.0f;
-	Int i;
+
+#ifdef LOAD_TEST_ASSETS
 	char buffer[ _MAX_PATH ];
+
 	if (strncmp(TEST_STRING, pMapObj->getName().str(), strlen(TEST_STRING)) == 0)
 	{
 		/* Handle test art models here */
 		strcpy(buffer, pMapObj->getName().str());
 
+		Int i;
 		for (i=0; buffer[i]; i++) {
 			if (buffer[i] == '/') {
 				i++;
@@ -1325,7 +1328,9 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 		}
 		modelName = buffer+i;
 	}
-	else
+#endif
+
+	if (modelName.isEmpty())
 	{
 		modelName = "No Model Name"; // must be this while GDF exists (it's the default)
 		const ThingTemplate *tTemplate;
@@ -1338,8 +1343,8 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			modelName = getBestModelName(tTemplate, state);
 			*scale = tTemplate->getAssetScale();
 
-		}  // end if
-	}  // end else
+		}
+	}
 	return modelName;
 }