Bladeren bron

Remove nonsense

Daniele Bartolini 10 jaren geleden
bovenliggende
commit
a3a20c51ac
1 gewijzigde bestanden met toevoegingen van 39 en 67 verwijderingen
  1. 39 67
      engine/config.h

+ 39 - 67
engine/config.h

@@ -13,33 +13,53 @@
 #	define CROWN_DEBUG 0
 #endif // CROWN_DEBUG
 
-#if !defined(CROWN_SOUND_OPENAL) \
+#if !defined(CROWN_PHYSICS_PHYSX)\
+	&& !defined(CROWN_PHYSICS_BULLET)
+
+	#ifndef CROWN_PHYSICS_PHYSX
+		#define CROWN_PHYSICS_PHYSX 1
+	#endif
+
+	#ifndef CROWN_PHYSICS_BULLET
+		#define CROWN_PHYSICS_BULLET 0
+	#endif
+#else
+	#ifndef CROWN_PHYSICS_PHYSX
+		#define CROWN_PHYSICS_PHYSX 0
+	#endif
+
+	#ifndef CROWN_PHYSICS_BULLET
+		#define CROWN_PHYSICS_BULLET 0
+	#endif
+#endif
+
+#if !defined(CROWN_SOUND_OPENAL)\
 	&& !defined(CROWN_SOUND_OPENSLES)\
 	&& !defined(CROWN_SOUND_NULL)
 
-#	ifndef CROWN_SOUND_OPENAL
-#		define CROWN_SOUND_OPENAL (CROWN_PLATFORM_LINUX || CROWN_PLATFORM_WINDOWS)
-#	endif // CROWN_SOUND_OPENAL
+	#ifndef CROWN_SOUND_OPENAL
+		#define CROWN_SOUND_OPENAL (CROWN_PLATFORM_LINUX || CROWN_PLATFORM_WINDOWS)
+	#endif // CROWN_SOUND_OPENAL
 
-#	ifndef CROWN_SOUND_OPENSLES
-#		define CROWN_SOUND_OPENSLES (CROWN_PLATFORM_ANDROID)
-#	endif // CROWN_SOUND_OPENSLES
+	#ifndef CROWN_SOUND_OPENSLES
+		#define CROWN_SOUND_OPENSLES (CROWN_PLATFORM_ANDROID)
+	#endif // CROWN_SOUND_OPENSLES
 
-#	ifndef CROWN_SOUND_NULL
-#		define CROWN_SOUND_NULL (!(CROWN_SOUND_OPENAL || CROWN_SOUND_OPENSLES))
-#	endif // CROWN_SOUND_NULL
+	#ifndef CROWN_SOUND_NULL
+		#define CROWN_SOUND_NULL (!(CROWN_SOUND_OPENAL || CROWN_SOUND_OPENSLES))
+	#endif // CROWN_SOUND_NULL
 #else
-#	ifndef CROWN_SOUND_OPENAL
-#		define CROWN_SOUND_OPENAL 0
-#	endif
+	#ifndef CROWN_SOUND_OPENAL
+		#define CROWN_SOUND_OPENAL 0
+	#endif
 
-#	ifndef CROWN_SOUND_OPENSLES
-#		define CROWN_SOUND_OPENSLES 0
-#	endif
+	#ifndef CROWN_SOUND_OPENSLES
+		#define CROWN_SOUND_OPENSLES 0
+	#endif
 
-#	ifndef CROWN_SOUND_NULL
-#		define CROWN_SOUND_NULL 0
-#	endif
+	#ifndef CROWN_SOUND_NULL
+		#define CROWN_SOUND_NULL 0
+	#endif
 #endif
 
 #ifndef CROWN_DEFAULT_PIXELS_PER_METER
@@ -62,58 +82,10 @@
 	#define CROWN_DATA_DIRECTORY "data"
 #endif // CROWN_DATA_DIRECTORY
 
-#ifndef CE_MAX_UNITS
-	#define CE_MAX_UNITS 65000 // Per world
-#endif // CE_MAX_UNITS
-
-#ifndef CE_MAX_CAMERAS
-	#define CE_MAX_CAMERAS 16 // Per world
-#endif // CE_MAX_CAMERAS
-
-#ifndef CE_MAX_ACTORS
-	#define CE_MAX_ACTORS 1024 // Per world
-#endif // CE_MAX_ACTORS
-
-#ifndef CE_MAX_CONTROLLERS
-	#define CE_MAX_CONTROLLERS 16 // Per world
-#endif // CE_MAX
-
-#ifndef CE_MAX_TRIGGERS
-	#define CE_MAX_TRIGGERS 1024 // Per world
-#endif // CE_MAX
-
-#ifndef CE_MAX_JOINTS
-	#define CE_MAX_JOINTS 512 // Per world
-#endif // CE_MAX
-
 #ifndef CE_MAX_SOUND_INSTANCES
 	#define CE_MAX_SOUND_INSTANCES 64 // Per world
 #endif // CE_MAX
 
-#ifndef CE_MAX_RAYCASTS
-	#define CE_MAX_RAYCASTS 8 // Per World
-#endif // CE_MAX
-
-#ifndef CE_MAX_RAY_INTERSECTIONS
-	#define CE_MAX_RAY_INTERSECTIONS 16
-#endif // CE_MAX
-
-#ifndef CE_MAX_CAMERA_COMPONENTS
-	#define CE_MAX_CAMERA_COMPONENTS 16 // Per unit
-#endif // CE_MAX
-
-#ifndef CE_MAX_SPRITE_COMPONENTS
-	#define CE_MAX_SPRITE_COMPONENTS 16 // Per unit
-#endif // CE_MAX
-
-#ifndef CE_MAX_ACTOR_COMPONENTS
-	#define CE_MAX_ACTOR_COMPONENTS 16 // Per unit
-#endif // CE_MAX
-
-#ifndef CE_MAX_MATERIAL_COMPONENTS
-	#define CE_MAX_MATERIAL_COMPONENTS 16 // Per unit
-#endif // CE_MAX
-
 #ifndef CE_MAX_CONSOLE_CLIENTS
 	#define CE_MAX_CONSOLE_CLIENTS 32
 #endif // CE_MAX