From 9a268f553869ee59288873e059ca938d404378c4 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 30 Jun 2012 10:16:52 +0200 Subject: [PATCH] Switched back to old standard; addded -Wall - removed -std=c++11 - added -Wall and removed most reported warnings --- CMakeLists.txt | 4 +-- src/app/app.cpp | 57 ++++++++++++++++++---------------- src/common/event.h | 33 ++++++-------------- src/graphics/common/camera.h | 3 -- src/graphics/common/particle.h | 2 -- 5 files changed, 43 insertions(+), 56 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b825022d..d0fc02ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ find_package(SDL_image REQUIRED) set(CMAKE_BUILD_TYPE debug) # Global compile flags -set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -O2") -set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -w -g -O0") +set(CMAKE_CXX_FLAGS_RELEASE "-O2") +set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0") # Subdirectory with sources add_subdirectory(src bin) diff --git a/src/app/app.cpp b/src/app/app.cpp index 43678523..5612c170 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -26,6 +26,8 @@ #include #include +#include + /** * \struct ApplicationPrivate @@ -252,6 +254,8 @@ bool CApplication::OpenJoystick() m_private->joystick = SDL_JoystickOpen(m_private->joystickIndex); if (m_private->joystick == NULL) return false; + + return true; } @@ -351,10 +355,10 @@ void CApplication::ParseEvent() else event.type = EVENT_KEY_UP; - event.data.key.key = m_private->currentEvent.key.keysym.sym; - event.data.key.mod = m_private->currentEvent.key.keysym.mod; - event.data.key.state = TranslatePressState(m_private->currentEvent.key.state); - event.data.key.unicode = m_private->currentEvent.key.keysym.unicode; + event.key.key = m_private->currentEvent.key.keysym.sym; + event.key.mod = m_private->currentEvent.key.keysym.mod; + event.key.state = TranslatePressState(m_private->currentEvent.key.state); + event.key.unicode = m_private->currentEvent.key.keysym.unicode; } else if ( (m_private->currentEvent.type == SDL_MOUSEBUTTONDOWN) || (m_private->currentEvent.type == SDL_MOUSEBUTTONUP) ) @@ -364,24 +368,24 @@ void CApplication::ParseEvent() else event.type = EVENT_MOUSE_BUTTON_UP; - event.data.mouseButton.button = m_private->currentEvent.button.button; - event.data.mouseButton.state = TranslatePressState(m_private->currentEvent.button.state); - event.data.mouseButton.pos = WindowToInterfaceCoords(m_private->currentEvent.button.x, m_private->currentEvent.button.y); + event.mouseButton.button = m_private->currentEvent.button.button; + event.mouseButton.state = TranslatePressState(m_private->currentEvent.button.state); + event.mouseButton.pos = WindowToInterfaceCoords(m_private->currentEvent.button.x, m_private->currentEvent.button.y); } else if (m_private->currentEvent.type == SDL_MOUSEMOTION) { event.type = EVENT_MOUSE_MOVE; - event.data.mouseMove.state = TranslatePressState(m_private->currentEvent.button.state); - event.data.mouseMove.pos = WindowToInterfaceCoords(m_private->currentEvent.button.x, m_private->currentEvent.button.y); + event.mouseMove.state = TranslatePressState(m_private->currentEvent.button.state); + event.mouseMove.pos = WindowToInterfaceCoords(m_private->currentEvent.button.x, m_private->currentEvent.button.y); } // TODO: joystick state polling instead of getting events else if (m_private->currentEvent.type == SDL_JOYAXISMOTION) { event.type = EVENT_JOY_AXIS; - event.data.joyAxis.axis = m_private->currentEvent.jaxis.axis; - event.data.joyAxis.value = m_private->currentEvent.jaxis.value; + event.joyAxis.axis = m_private->currentEvent.jaxis.axis; + event.joyAxis.value = m_private->currentEvent.jaxis.value; } else if ( (m_private->currentEvent.type == SDL_JOYBUTTONDOWN) || (m_private->currentEvent.type == SDL_JOYBUTTONUP) ) @@ -391,8 +395,8 @@ void CApplication::ParseEvent() else event.type = EVENT_JOY_BUTTON_UP; - event.data.joyButton.button = m_private->currentEvent.jbutton.button; - event.data.joyButton.state = TranslatePressState(m_private->currentEvent.jbutton.state); + event.joyButton.button = m_private->currentEvent.jbutton.button; + event.joyButton.state = TranslatePressState(m_private->currentEvent.jbutton.state); } @@ -414,33 +418,33 @@ void CApplication::ProcessEvent(Event event) case EVENT_KEY_DOWN: case EVENT_KEY_UP: printf("EVENT_KEY_%s:\n", (event.type == EVENT_KEY_DOWN) ? "DOWN" : "UP"); - printf(" key = %4x\n", event.data.key.key); - printf(" state = %s\n", (event.data.key.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); - printf(" mod = %4x\n", event.data.key.mod); - printf(" unicode = %4x\n", event.data.key.unicode); + printf(" key = %4x\n", event.key.key); + printf(" state = %s\n", (event.key.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); + printf(" mod = %4x\n", event.key.mod); + printf(" unicode = %4x\n", event.key.unicode); break; case EVENT_MOUSE_MOVE: printf("EVENT_MOUSE_MOVE:\n"); - printf(" state = %s\n", (event.data.mouseMove.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); - printf(" pos = (%f, %f)\n", event.data.mouseMove.pos.x, event.data.mouseMove.pos.y); + printf(" state = %s\n", (event.mouseMove.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); + printf(" pos = (%f, %f)\n", event.mouseMove.pos.x, event.mouseMove.pos.y); break; case EVENT_MOUSE_BUTTON_DOWN: case EVENT_MOUSE_BUTTON_UP: printf("EVENT_MOUSE_BUTTON_%s:\n", (event.type == EVENT_MOUSE_BUTTON_DOWN) ? "DOWN" : "UP"); - printf(" button = %d\n", event.data.mouseButton.button); - printf(" state = %s\n", (event.data.mouseButton.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); - printf(" pos = (%f, %f)\n", event.data.mouseButton.pos.x, event.data.mouseButton.pos.y); + printf(" button = %d\n", event.mouseButton.button); + printf(" state = %s\n", (event.mouseButton.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); + printf(" pos = (%f, %f)\n", event.mouseButton.pos.x, event.mouseButton.pos.y); break; case EVENT_JOY_AXIS: printf("EVENT_JOY_AXIS:\n"); - printf(" axis = %d\n", event.data.joyAxis.axis); - printf(" value = %d\n", event.data.joyAxis.value); + printf(" axis = %d\n", event.joyAxis.axis); + printf(" value = %d\n", event.joyAxis.value); break; case EVENT_JOY_BUTTON_DOWN: case EVENT_JOY_BUTTON_UP: printf("EVENT_JOY_BUTTON_%s:\n", (event.type == EVENT_JOY_BUTTON_DOWN) ? "DOWN" : "UP"); - printf(" button = %d\n", event.data.joyButton.button); - printf(" state = %s\n", (event.data.mouseButton.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); + printf(" button = %d\n", event.joyButton.button); + printf(" state = %s\n", (event.mouseButton.state == STATE_PRESSED) ? "STATE_PRESSED" : "STATE_RELEASED"); break; default: break; @@ -569,6 +573,7 @@ bool CApplication::RetJoystickEnabled() bool CApplication::WriteScreenShot(char *filename, int width, int height) { // TODO + return false; } void CApplication::InitText() diff --git a/src/common/event.h b/src/common/event.h index e7ff552d..70b110d0 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -637,31 +637,18 @@ struct Event { //! Type of event (EVENT_*) EventType type; - /** - \union EventDataUnion - \brief Additional data associated with some events - For the listed event, the given member is filled with data. - For other event types, it is filled with zeros. - */ - union EventDataUnion - { - //! Additional data for EVENT_KEY_DOWN and EVENT_KEY_UP - KeyEventData key; - //! Additional data for EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP - MouseButtonEventData mouseButton; - //! Additional data for EVENT_MOUSE_MOVE - MouseMoveEventData mouseMove; - //! Additional data for EVENT_JOY - JoyAxisEventData joyAxis; - //! Additional data for EVENT_JOY_AXIS - JoyButtonEventData joyButton; + //! Additional data for EVENT_KEY_DOWN and EVENT_KEY_UP + KeyEventData key; + //! Additional data for EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP + MouseButtonEventData mouseButton; + //! Additional data for EVENT_MOUSE_MOVE + MouseMoveEventData mouseMove; + //! Additional data for EVENT_JOY + JoyAxisEventData joyAxis; + //! Additional data for EVENT_JOY_AXIS + JoyButtonEventData joyButton; - EventDataUnion() - { memset(this, 0, sizeof(EventDataUnion)); } - ~EventDataUnion() - {} - } data; //? long param; // parameter //? Math::Point pos; // mouse position (0 .. 1) //? float axeX; // control the X axis (-1 .. 1) diff --git a/src/graphics/common/camera.h b/src/graphics/common/camera.h index f17ecef7..be520617 100644 --- a/src/graphics/common/camera.h +++ b/src/graphics/common/camera.h @@ -24,9 +24,6 @@ class CInstanceManager; -class Gfx::CEngine; -class Gfx::CTerrain; -class Gfx::CWater; class CObject; namespace Gfx { diff --git a/src/graphics/common/particle.h b/src/graphics/common/particle.h index e430e2af..dd9f4e39 100644 --- a/src/graphics/common/particle.h +++ b/src/graphics/common/particle.h @@ -25,8 +25,6 @@ class CInstanceManager; class CRobotMain; -class Gfx::CTerrain; -class Gfx::CWater; class CObject;