From b68dfcd15576605a1748838f2459bac1ea8cf228 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Mon, 13 Aug 2012 18:03:12 +0200 Subject: Test fix --- src/graphics/opengl/test/CMakeLists.txt | 7 ++++--- src/graphics/opengl/test/light_test.cpp | 8 ++++---- src/graphics/opengl/test/model_test.cpp | 8 ++++---- src/graphics/opengl/test/texture_test.cpp | 2 +- src/graphics/opengl/test/transform_test.cpp | 8 ++++---- 5 files changed, 17 insertions(+), 16 deletions(-) (limited to 'src/graphics/opengl') diff --git a/src/graphics/opengl/test/CMakeLists.txt b/src/graphics/opengl/test/CMakeLists.txt index 8ed7364..be33ac6 100644 --- a/src/graphics/opengl/test/CMakeLists.txt +++ b/src/graphics/opengl/test/CMakeLists.txt @@ -6,7 +6,7 @@ find_package(SDL_image REQUIRED) find_package(PNG REQUIRED) set(CMAKE_BUILD_TYPE debug) -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0") +set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0 -Wold-style-cast -std=gnu++0x") set(ADD_LIBS "") @@ -77,8 +77,9 @@ ${ADD_LIBS} add_executable(texture_test ${TEXTURE_SOURCES}) target_link_libraries(texture_test ${LIBS}) -add_executable(model_test ${MODEL_SOURCES}) -target_link_libraries(model_test ${LIBS}) +# Temporarily disabling because of dependencies on CEngine et al. +#add_executable(model_test ${MODEL_SOURCES}) +#target_link_libraries(model_test ${LIBS}) add_executable(transform_test ${TRANSFORM_SOURCES}) target_link_libraries(transform_test ${LIBS}) diff --git a/src/graphics/opengl/test/light_test.cpp b/src/graphics/opengl/test/light_test.cpp index 80fa911..6ff3b1c 100644 --- a/src/graphics/opengl/test/light_test.cpp +++ b/src/graphics/opengl/test/light_test.cpp @@ -313,7 +313,7 @@ void KeyboardUp(SDLKey key) void MouseMove(int x, int y) { - Math::Point currentPos((float)x, (float)y); + Math::Point currentPos(static_cast(x), static_cast(y)); static bool first = true; if (first || (x < 10) || (y < 10) || (x > 790) || (y > 590)) @@ -326,8 +326,8 @@ void MouseMove(int x, int y) return; } - ROTATION.y = ROTATION_BASE.y + ((float) (x - MOUSE_POS_BASE.x) / 800.0f) * Math::PI; - ROTATION.x = ROTATION_BASE.x + ((float) (y - MOUSE_POS_BASE.y) / 600.0f) * Math::PI; + ROTATION.y = ROTATION_BASE.y + (static_cast (x - MOUSE_POS_BASE.x) / 800.0f) * Math::PI; + ROTATION.x = ROTATION_BASE.x + (static_cast (y - MOUSE_POS_BASE.y) / 600.0f) * Math::PI; } int main(int argc, char *argv[]) @@ -378,7 +378,7 @@ int main(int argc, char *argv[]) //SDL_WM_GrabInput(SDL_GRAB_ON); SDL_ShowCursor(SDL_DISABLE); - Gfx::CGLDevice *device = new Gfx::CGLDevice(); + Gfx::CGLDevice *device = new Gfx::CGLDevice(Gfx::GLDeviceConfig()); device->Create(); Init(device); diff --git a/src/graphics/opengl/test/model_test.cpp b/src/graphics/opengl/test/model_test.cpp index 3e8efe6..e951e6e 100644 --- a/src/graphics/opengl/test/model_test.cpp +++ b/src/graphics/opengl/test/model_test.cpp @@ -54,7 +54,7 @@ void LoadTexture(Gfx::CGLDevice *device, const std::string &name) Gfx::Texture tex = GetTexture(name); - if (tex.valid) + if (tex.Valid()) return; CImage img; @@ -84,7 +84,7 @@ void Init(Gfx::CGLDevice *device, Gfx::CModelFile *model) { std::vector &triangles = model->GetTriangles(); - for (int i = 0; i < (int) triangles.size(); ++i) + for (int i = 0; i < static_cast( triangles.size() ); ++i) { LoadTexture(device, triangles[i].tex1Name); LoadTexture(device, triangles[i].tex2Name); @@ -131,7 +131,7 @@ void Render(Gfx::CGLDevice *device, Gfx::CModelFile *modelFile) Gfx::VertexTex2 tri[3]; - for (int i = 0; i < (int) triangles.size(); ++i) + for (int i = 0; i < static_cast( triangles.size() ); ++i) { device->SetTexture(0, GetTexture(triangles[i].tex1Name)); device->SetTexture(1, GetTexture(triangles[i].tex2Name)); @@ -334,7 +334,7 @@ int main(int argc, char *argv[]) SDL_WM_SetCaption("Model Test", "Model Test"); - Gfx::CGLDevice *device = new Gfx::CGLDevice(); + Gfx::CGLDevice *device = new Gfx::CGLDevice(Gfx::GLDeviceConfig()); device->Create(); Init(device, modelFile); diff --git a/src/graphics/opengl/test/texture_test.cpp b/src/graphics/opengl/test/texture_test.cpp index c3c568b..534a5c0 100644 --- a/src/graphics/opengl/test/texture_test.cpp +++ b/src/graphics/opengl/test/texture_test.cpp @@ -160,7 +160,7 @@ int main() SDL_WM_SetCaption("Texture Test", "Texture Test"); - Gfx::CGLDevice *device = new Gfx::CGLDevice(); + Gfx::CGLDevice *device = new Gfx::CGLDevice(Gfx::GLDeviceConfig()); device->Create(); Init(device); diff --git a/src/graphics/opengl/test/transform_test.cpp b/src/graphics/opengl/test/transform_test.cpp index 83819b8..cddd1b8 100644 --- a/src/graphics/opengl/test/transform_test.cpp +++ b/src/graphics/opengl/test/transform_test.cpp @@ -215,7 +215,7 @@ void KeyboardUp(SDLKey key) void MouseMove(int x, int y) { - Math::Point currentPos((float)x, (float)y); + Math::Point currentPos(static_cast(x), static_cast(y)); static bool first = true; if (first || (x < 10) || (y < 10) || (x > 790) || (y > 590)) @@ -228,8 +228,8 @@ void MouseMove(int x, int y) return; } - ROTATION.y = ROTATION_BASE.y + ((float) (x - MOUSE_POS_BASE.x) / 800.0f) * Math::PI; - ROTATION.x = ROTATION_BASE.x + ((float) (y - MOUSE_POS_BASE.y) / 600.0f) * Math::PI; + ROTATION.y = ROTATION_BASE.y + (static_cast (x - MOUSE_POS_BASE.x) / 800.0f) * Math::PI; + ROTATION.x = ROTATION_BASE.x + (static_cast (y - MOUSE_POS_BASE.y) / 600.0f) * Math::PI; } int main(int argc, char *argv[]) @@ -280,7 +280,7 @@ int main(int argc, char *argv[]) //SDL_WM_GrabInput(SDL_GRAB_ON); SDL_ShowCursor(SDL_DISABLE); - Gfx::CGLDevice *device = new Gfx::CGLDevice(); + Gfx::CGLDevice *device = new Gfx::CGLDevice(Gfx::GLDeviceConfig()); device->Create(); Init(device); -- cgit v1.2.3-1-g7c22