Daniele Bartolini 11 лет назад
Родитель
Сommit
af6de3f444
2 измененных файлов с 5 добавлено и 5 удалено
  1. 3 3
      engine/config.h
  2. 2 2
      engine/resource/sprite_resource.cpp

+ 3 - 3
engine/config.h

@@ -30,9 +30,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "platform.h"
 
-#ifndef CE_PIXELS_PER_METER
-	#define CE_PIXELS_PER_METER 32
-#endif // CE_PIXELS_PER_METER
+#ifndef CROWN_DEFAULT_PIXELS_PER_METER
+	#define CROWN_DEFAULT_PIXELS_PER_METER 32
+#endif // CROWN_DEFAULT_PIXELS_PER_METER
 
 #ifndef CROWN_DEFAULT_WINDOW_WIDTH
 	#define CROWN_DEFAULT_WINDOW_WIDTH 1280

+ 2 - 2
engine/resource/sprite_resource.cpp

@@ -93,8 +93,8 @@ namespace sprite_resource
 			const float v1 = (fd.region.y + fd.region.w) / height;
 
 			// Compute positions
-			const float w = fd.region.z / CE_PIXELS_PER_METER;
-			const float h = fd.region.w / CE_PIXELS_PER_METER;
+			const float w = fd.region.z / CROWN_DEFAULT_PIXELS_PER_METER;
+			const float h = fd.region.w / CROWN_DEFAULT_PIXELS_PER_METER;
 
 			const float x0 = fd.scale.x * (-w * 0.5f) + fd.offset.x;
 			const float y0 = fd.scale.y * (-h * 0.5f) + fd.offset.y;