From b84825978803615f45a9f128232e62431042aec0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Sun, 11 Dec 2016 17:34:33 +0700 Subject: [PATCH] Sorted all source files in folders --- CMakeLists.txt | 122 +++++++++++++------------ Source/Animation/Animation.cpp | 2 +- Source/Animation/Animation.h | 1 + Source/Animation/Joint.cpp | 2 +- Source/Animation/Joint.h | 2 +- Source/Animation/Muscle.cpp | 2 +- Source/Animation/Skeleton.cpp | 4 +- Source/Animation/Skeleton.h | 13 ++- Source/{ => Audio}/Sounds.cpp | 6 +- Source/{ => Audio}/Sounds.def | 0 Source/{ => Audio}/Sounds.h | 0 Source/{ => Audio}/openal_wrapper.cpp | 6 +- Source/{ => Audio}/openal_wrapper.h | 1 + Source/{ => Devtools}/ConsoleCmds.cpp | 6 +- Source/{ => Devtools}/ConsoleCmds.def | 0 Source/{ => Devtools}/ConsoleCmds.h | 0 Source/{ => Environment}/Lights.cpp | 2 +- Source/{ => Environment}/Lights.h | 4 +- Source/{ => Environment}/Skybox.cpp | 2 +- Source/{ => Environment}/Skybox.h | 10 +- Source/{ => Environment}/Terrain.cpp | 4 +- Source/{ => Environment}/Terrain.h | 14 +-- Source/Game.cpp | 7 +- Source/Game.h | 36 ++++---- Source/GameDraw.cpp | 12 +-- Source/GameInitDispose.cpp | 6 +- Source/GameTick.cpp | 18 ++-- Source/Globals.cpp | 18 +--- Source/{ => Graphic}/Models.cpp | 2 +- Source/{ => Graphic}/Models.h | 10 +- Source/{ => Graphic}/Sprite.cpp | 5 +- Source/{ => Graphic}/Sprite.h | 18 ++-- Source/{ => Graphic}/Stereo.cpp | 2 +- Source/{ => Graphic}/Stereo.h | 0 Source/{ => Graphic}/Text.cpp | 2 +- Source/{ => Graphic}/Text.h | 11 +-- Source/{ => Graphic}/Texture.cpp | 6 +- Source/{ => Graphic}/Texture.h | 0 Source/{ => Graphic}/gamegl.h | 0 Source/{ => Level}/Awards.cpp | 4 +- Source/{ => Level}/Awards.def | 0 Source/{ => Level}/Awards.h | 0 Source/{ => Level}/Bonuses.def | 0 Source/{ => Level}/Campaign.cpp | 3 +- Source/{ => Level}/Campaign.h | 2 +- Source/{ => Level}/Dialog.cpp | 9 +- Source/{ => Level}/Dialog.h | 3 +- Source/{ => Level}/Hotspot.cpp | 2 +- Source/{ => Level}/Hotspot.h | 2 +- Source/MacCompatibility.h | 2 +- Source/{ => Math}/Frustum.cpp | 4 +- Source/{ => Math}/Frustum.h | 0 Source/{ => Math}/PhysicsMath.h | 0 Source/{ => Math}/Quaternions.cpp | 2 +- Source/{ => Math}/Quaternions.h | 2 +- Source/{ => Math}/Random.h | 0 Source/{ => Menu}/Menu.cpp | 14 +-- Source/{ => Menu}/Menu.h | 0 Source/{ => Objects}/Objects.cpp | 3 +- Source/{ => Objects}/Objects.h | 21 +++-- Source/{ => Objects}/Person.cpp | 13 +-- Source/{ => Objects}/Person.h | 18 ++-- Source/{ => Objects}/Weapons.cpp | 9 +- Source/{ => Objects}/Weapons.h | 16 ++-- Source/{ => Thirdparty}/optionparser.h | 14 +-- Source/{ => User}/Account.cpp | 6 +- Source/{ => User}/Account.h | 0 Source/{ => User}/Settings.cpp | 4 +- Source/{ => User}/Settings.h | 0 Source/{ => Utils}/ImageIO.cpp | 2 +- Source/{ => Utils}/ImageIO.h | 2 +- Source/{ => Utils}/Input.cpp | 2 +- Source/{ => Utils}/Input.h | 0 Source/{ => Utils}/binio.h | 0 Source/{ => Utils}/pack.c | 0 Source/{ => Utils}/private.c | 0 Source/{ => Utils}/private.h | 0 Source/{ => Utils}/unpack.c | 0 Source/WinDefs.h | 2 +- Source/main.cpp | 6 +- 80 files changed, 261 insertions(+), 262 deletions(-) rename Source/{ => Audio}/Sounds.cpp (97%) rename Source/{ => Audio}/Sounds.def (100%) rename Source/{ => Audio}/Sounds.h (100%) rename Source/{ => Audio}/openal_wrapper.cpp (99%) rename Source/{ => Audio}/openal_wrapper.h (99%) rename Source/{ => Devtools}/ConsoleCmds.cpp (99%) rename Source/{ => Devtools}/ConsoleCmds.def (100%) rename Source/{ => Devtools}/ConsoleCmds.h (100%) rename Source/{ => Environment}/Lights.cpp (98%) rename Source/{ => Environment}/Lights.h (95%) rename Source/{ => Environment}/Skybox.cpp (99%) rename Source/{ => Environment}/Skybox.h (88%) rename Source/{ => Environment}/Terrain.cpp (99%) rename Source/{ => Environment}/Terrain.h (95%) rename Source/{ => Graphic}/Models.cpp (99%) rename Source/{ => Graphic}/Models.h (96%) rename Source/{ => Graphic}/Sprite.cpp (99%) rename Source/{ => Graphic}/Sprite.h (90%) rename Source/{ => Graphic}/Stereo.cpp (99%) rename Source/{ => Graphic}/Stereo.h (100%) rename Source/{ => Graphic}/Text.cpp (99%) rename Source/{ => Graphic}/Text.h (93%) rename Source/{ => Graphic}/Texture.cpp (97%) rename Source/{ => Graphic}/Texture.h (100%) rename Source/{ => Graphic}/gamegl.h (100%) rename Source/{ => Level}/Awards.cpp (98%) rename Source/{ => Level}/Awards.def (100%) rename Source/{ => Level}/Awards.h (100%) rename Source/{ => Level}/Bonuses.def (100%) rename Source/{ => Level}/Campaign.cpp (99%) rename Source/{ => Level}/Campaign.h (98%) rename Source/{ => Level}/Dialog.cpp (98%) rename Source/{ => Level}/Dialog.h (98%) rename Source/{ => Level}/Hotspot.cpp (97%) rename Source/{ => Level}/Hotspot.h (97%) rename Source/{ => Math}/Frustum.cpp (99%) rename Source/{ => Math}/Frustum.h (100%) rename Source/{ => Math}/PhysicsMath.h (100%) rename Source/{ => Math}/Quaternions.cpp (99%) rename Source/{ => Math}/Quaternions.h (99%) rename Source/{ => Math}/Random.h (100%) rename Source/{ => Menu}/Menu.cpp (99%) rename Source/{ => Menu}/Menu.h (100%) rename Source/{ => Objects}/Objects.cpp (99%) rename Source/{ => Objects}/Objects.h (88%) rename Source/{ => Objects}/Person.cpp (99%) rename Source/{ => Objects}/Person.h (98%) rename Source/{ => Objects}/Weapons.cpp (99%) rename Source/{ => Objects}/Weapons.h (93%) rename Source/{ => Thirdparty}/optionparser.h (99%) rename Source/{ => User}/Account.cpp (99%) rename Source/{ => User}/Account.h (100%) rename Source/{ => User}/Settings.cpp (99%) rename Source/{ => User}/Settings.h (100%) rename Source/{ => Utils}/ImageIO.cpp (99%) rename Source/{ => Utils}/ImageIO.h (98%) rename Source/{ => Utils}/Input.cpp (99%) rename Source/{ => Utils}/Input.h (100%) rename Source/{ => Utils}/binio.h (100%) rename Source/{ => Utils}/pack.c (100%) rename Source/{ => Utils}/private.c (100%) rename Source/{ => Utils}/private.h (100%) rename Source/{ => Utils}/unpack.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 087eafe..62a62f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,40 +48,41 @@ set(LUGARU_SRCS ${SRCDIR}/Animation/Joint.cpp ${SRCDIR}/Animation/Muscle.cpp ${SRCDIR}/Animation/Skeleton.cpp - ${SRCDIR}/Frustum.cpp - ${SRCDIR}/Account.cpp - ${SRCDIR}/Campaign.cpp - ${SRCDIR}/ConsoleCmds.cpp - ${SRCDIR}/Dialog.cpp - ${SRCDIR}/Hotspot.cpp + ${SRCDIR}/Audio/openal_wrapper.cpp + ${SRCDIR}/Audio/Sounds.cpp + ${SRCDIR}/Devtools/ConsoleCmds.cpp + ${SRCDIR}/Environment/Lights.cpp + ${SRCDIR}/Environment/Skybox.cpp + ${SRCDIR}/Environment/Terrain.cpp + ${SRCDIR}/Graphic/Models.cpp + ${SRCDIR}/Graphic/Sprite.cpp + ${SRCDIR}/Graphic/Stereo.cpp + ${SRCDIR}/Graphic/Text.cpp + ${SRCDIR}/Graphic/Texture.cpp + ${SRCDIR}/Level/Awards.cpp + ${SRCDIR}/Level/Campaign.cpp + ${SRCDIR}/Level/Dialog.cpp + ${SRCDIR}/Level/Hotspot.cpp + ${SRCDIR}/Math/Frustum.cpp + ${SRCDIR}/Math/Quaternions.cpp + ${SRCDIR}/Menu/Menu.cpp + ${SRCDIR}/Objects/Objects.cpp + ${SRCDIR}/Objects/Person.cpp + ${SRCDIR}/Objects/Weapons.cpp + ${SRCDIR}/User/Account.cpp + ${SRCDIR}/User/Settings.cpp + ${SRCDIR}/Utils/Folders.cpp + ${SRCDIR}/Utils/ImageIO.cpp + ${SRCDIR}/Utils/Input.cpp + ${SRCDIR}/Utils/pack.c + ${SRCDIR}/Utils/private.c + ${SRCDIR}/Utils/unpack.c ${SRCDIR}/Game.cpp ${SRCDIR}/GameDraw.cpp ${SRCDIR}/GameInitDispose.cpp ${SRCDIR}/GameTick.cpp ${SRCDIR}/Globals.cpp - ${SRCDIR}/Lights.cpp - ${SRCDIR}/Menu.cpp - ${SRCDIR}/Models.cpp - ${SRCDIR}/Objects.cpp - ${SRCDIR}/pack.c - ${SRCDIR}/Person.cpp - ${SRCDIR}/private.c - ${SRCDIR}/Quaternions.cpp - ${SRCDIR}/Skybox.cpp - ${SRCDIR}/Sprite.cpp - ${SRCDIR}/Terrain.cpp - ${SRCDIR}/Texture.cpp - ${SRCDIR}/Text.cpp - ${SRCDIR}/ImageIO.cpp - ${SRCDIR}/unpack.c - ${SRCDIR}/Weapons.cpp - ${SRCDIR}/openal_wrapper.cpp - ${SRCDIR}/Input.cpp - ${SRCDIR}/Settings.cpp - ${SRCDIR}/Stereo.cpp - ${SRCDIR}/Sounds.cpp - ${SRCDIR}/Awards.cpp - ${SRCDIR}/Utils/Folders.cpp + ) set(LUGARU_H @@ -89,38 +90,39 @@ set(LUGARU_H ${SRCDIR}/Animation/Joint.h ${SRCDIR}/Animation/Muscle.h ${SRCDIR}/Animation/Skeleton.h - ${SRCDIR}/Frustum.h - ${SRCDIR}/Account.h - ${SRCDIR}/Campaign.h - ${SRCDIR}/ConsoleCmds.h - ${SRCDIR}/Dialog.h - ${SRCDIR}/Hotspot.h - ${SRCDIR}/Game.h - ${SRCDIR}/Lights.h - ${SRCDIR}/Menu.h - ${SRCDIR}/Models.h - ${SRCDIR}/Objects.h - ${SRCDIR}/Person.h - ${SRCDIR}/PhysicsMath.h - ${SRCDIR}/Quaternions.h - ${SRCDIR}/Random.h - ${SRCDIR}/Skybox.h - ${SRCDIR}/Sprite.h - ${SRCDIR}/ImageIO.h - ${SRCDIR}/Terrain.h - ${SRCDIR}/Texture.h - ${SRCDIR}/Text.h - ${SRCDIR}/Weapons.h - ${SRCDIR}/Input.h - ${SRCDIR}/binio.h - ${SRCDIR}/openal_wrapper.h - ${SRCDIR}/optionparser.h - ${SRCDIR}/gamegl.h - ${SRCDIR}/private.h - ${SRCDIR}/Settings.h - ${SRCDIR}/Stereo.h - ${SRCDIR}/Sounds.h + ${SRCDIR}/Audio/openal_wrapper.h + ${SRCDIR}/Audio/Sounds.h + ${SRCDIR}/Devtools/ConsoleCmds.h + ${SRCDIR}/Environment/Lights.h + ${SRCDIR}/Environment/Skybox.h + ${SRCDIR}/Environment/Terrain.h + ${SRCDIR}/Graphic/gamegl.h + ${SRCDIR}/Graphic/Models.h + ${SRCDIR}/Graphic/Sprite.h + ${SRCDIR}/Graphic/Stereo.h + ${SRCDIR}/Graphic/Text.h + ${SRCDIR}/Graphic/Texture.h + ${SRCDIR}/Level/Campaign.h + ${SRCDIR}/Level/Dialog.h + ${SRCDIR}/Level/Hotspot.h + ${SRCDIR}/Math/Frustum.h + ${SRCDIR}/Math/PhysicsMath.h + ${SRCDIR}/Math/Quaternions.h + ${SRCDIR}/Math/Random.h + ${SRCDIR}/Menu/Menu.h + ${SRCDIR}/Objects/Objects.h + ${SRCDIR}/Objects/Person.h + ${SRCDIR}/Objects/Weapons.h + ${SRCDIR}/Thirdparty/optionparser.h + ${SRCDIR}/User/Account.h + ${SRCDIR}/User/Settings.h + ${SRCDIR}/Utils/binio.h ${SRCDIR}/Utils/Folders.h + ${SRCDIR}/Utils/ImageIO.h + ${SRCDIR}/Utils/Input.h + ${SRCDIR}/Utils/private.h + ${SRCDIR}/Game.h + ) if(UNIX) diff --git a/Source/Animation/Animation.cpp b/Source/Animation/Animation.cpp index 83e2c0e..4433800 100644 --- a/Source/Animation/Animation.cpp +++ b/Source/Animation/Animation.cpp @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Animation/Skeleton.h" #include "Animation/Animation.h" +#include "Animation/Skeleton.h" #include "Utils/Folders.h" #include "Game.h" diff --git a/Source/Animation/Animation.h b/Source/Animation/Animation.h index 4a74c5c..91205ab 100644 --- a/Source/Animation/Animation.h +++ b/Source/Animation/Animation.h @@ -21,6 +21,7 @@ along with Lugaru. If not, see . #define ANIMATION_H #include +#include "Math/Quaternions.h" enum anim_attack_type { neutral, normalattack, reversed, reversal diff --git a/Source/Animation/Joint.cpp b/Source/Animation/Joint.cpp index 4d3dd7c..4428cb8 100644 --- a/Source/Animation/Joint.cpp +++ b/Source/Animation/Joint.cpp @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ #include "Animation/Joint.h" -#include "binio.h" +#include "Utils/binio.h" Joint::Joint() : blurred(0), diff --git a/Source/Animation/Joint.h b/Source/Animation/Joint.h index c4c8e3b..124d7a6 100644 --- a/Source/Animation/Joint.h +++ b/Source/Animation/Joint.h @@ -21,7 +21,7 @@ along with Lugaru. If not, see . #ifndef _JOINT_H_ #define _JOINT_H_ -#include "Quaternions.h" +#include "Math/Quaternions.h" #include enum bodypart { diff --git a/Source/Animation/Muscle.cpp b/Source/Animation/Muscle.cpp index 94ed5b1..c4f201a 100644 --- a/Source/Animation/Muscle.cpp +++ b/Source/Animation/Muscle.cpp @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ #include "Animation/Muscle.h" -#include "binio.h" +#include "Utils/binio.h" extern float multiplier; extern bool freeze; diff --git a/Source/Animation/Skeleton.cpp b/Source/Animation/Skeleton.cpp index ee247c5..f525240 100644 --- a/Source/Animation/Skeleton.cpp +++ b/Source/Animation/Skeleton.cpp @@ -20,9 +20,9 @@ along with Lugaru. If not, see . /**> HEADER FILES <**/ #include "Game.h" -#include "Animation/Skeleton.h" -#include "openal_wrapper.h" #include "Animation/Animation.h" +#include "Animation/Skeleton.h" +#include "Audio/openal_wrapper.h" #include "Utils/Folders.h" extern float multiplier; diff --git a/Source/Animation/Skeleton.h b/Source/Animation/Skeleton.h index db03e75..19db503 100644 --- a/Source/Animation/Skeleton.h +++ b/Source/Animation/Skeleton.h @@ -21,17 +21,16 @@ along with Lugaru. If not, see . #ifndef _SKELETON_H_ #define _SKELETON_H_ -#include "Models.h" - /**> HEADER FILES <**/ -#include "gamegl.h" -#include "Quaternions.h" -#include "Objects.h" -#include "Sprite.h" -#include "binio.h" #include "Animation/Animation.h" #include "Animation/Joint.h" #include "Animation/Muscle.h" +#include "Graphic/gamegl.h" +#include "Graphic/Models.h" +#include "Graphic/Sprite.h" +#include "Math/Quaternions.h" +#include "Objects/Objects.h" +#include "Utils/binio.h" const int max_joints = 50; diff --git a/Source/Sounds.cpp b/Source/Audio/Sounds.cpp similarity index 97% rename from Source/Sounds.cpp rename to Source/Audio/Sounds.cpp index 735d939..2e47da0 100644 --- a/Source/Sounds.cpp +++ b/Source/Audio/Sounds.cpp @@ -17,9 +17,9 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Quaternions.h" -#include "Sounds.h" -#include "openal_wrapper.h" +#include "Audio/openal_wrapper.h" +#include "Audio/Sounds.h" +#include "Math/Quaternions.h" #include "Utils/Folders.h" struct OPENAL_SAMPLE *samp[sounds_count]; diff --git a/Source/Sounds.def b/Source/Audio/Sounds.def similarity index 100% rename from Source/Sounds.def rename to Source/Audio/Sounds.def diff --git a/Source/Sounds.h b/Source/Audio/Sounds.h similarity index 100% rename from Source/Sounds.h rename to Source/Audio/Sounds.h diff --git a/Source/openal_wrapper.cpp b/Source/Audio/openal_wrapper.cpp similarity index 99% rename from Source/openal_wrapper.cpp rename to Source/Audio/openal_wrapper.cpp index ecac525..e1e2346 100644 --- a/Source/openal_wrapper.cpp +++ b/Source/Audio/openal_wrapper.cpp @@ -22,9 +22,9 @@ along with Lugaru. If not, see . #include #include -#include "Quaternions.h" -#include "openal_wrapper.h" -#include "Sounds.h" +#include "Math/Quaternions.h" +#include "Audio/openal_wrapper.h" +#include "Audio/Sounds.h" #include "Game.h" extern float slomofreq; diff --git a/Source/openal_wrapper.h b/Source/Audio/openal_wrapper.h similarity index 99% rename from Source/openal_wrapper.h rename to Source/Audio/openal_wrapper.h index 16d4f67..b8de914 100644 --- a/Source/openal_wrapper.h +++ b/Source/Audio/openal_wrapper.h @@ -31,6 +31,7 @@ along with Lugaru. If not, see . #include "ogg/ogg.h" #include "vorbis/vorbisfile.h" +#include "Math/Quaternions.h" #include "MacCompatibility.h" #if 0 /* this should only be enable if OPENAL doesn't provide AL_API on all platforms */ diff --git a/Source/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp similarity index 99% rename from Source/ConsoleCmds.cpp rename to Source/Devtools/ConsoleCmds.cpp index df26f82..dc4c275 100644 --- a/Source/ConsoleCmds.cpp +++ b/Source/Devtools/ConsoleCmds.cpp @@ -18,10 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "ConsoleCmds.h" #include "Game.h" -#include "Dialog.h" -#include "Hotspot.h" +#include "Devtools/ConsoleCmds.h" +#include "Level/Dialog.h" +#include "Level/Hotspot.h" #include "Utils/Folders.h" const char *cmd_names[cmd_count] = { diff --git a/Source/ConsoleCmds.def b/Source/Devtools/ConsoleCmds.def similarity index 100% rename from Source/ConsoleCmds.def rename to Source/Devtools/ConsoleCmds.def diff --git a/Source/ConsoleCmds.h b/Source/Devtools/ConsoleCmds.h similarity index 100% rename from Source/ConsoleCmds.h rename to Source/Devtools/ConsoleCmds.h diff --git a/Source/Lights.cpp b/Source/Environment/Lights.cpp similarity index 98% rename from Source/Lights.cpp rename to Source/Environment/Lights.cpp index cd20a66..17efb4c 100644 --- a/Source/Lights.cpp +++ b/Source/Environment/Lights.cpp @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ /**> HEADER FILES <**/ -#include "Lights.h" +#include "Environment/Lights.h" void SetUpLight(Light* whichsource, int whichlight) { diff --git a/Source/Lights.h b/Source/Environment/Lights.h similarity index 95% rename from Source/Lights.h rename to Source/Environment/Lights.h index e846fb6..ba1fd6c 100644 --- a/Source/Lights.h +++ b/Source/Environment/Lights.h @@ -23,8 +23,8 @@ along with Lugaru. If not, see . /**> HEADER FILES <**/ -#include "gamegl.h" -#include "Quaternions.h" +#include "Graphic/gamegl.h" +#include "Math/Quaternions.h" class Light { diff --git a/Source/Skybox.cpp b/Source/Environment/Skybox.cpp similarity index 99% rename from Source/Skybox.cpp rename to Source/Environment/Skybox.cpp index 8fcc967..ce58adf 100644 --- a/Source/Skybox.cpp +++ b/Source/Environment/Skybox.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Skybox.h" +#include "Environment/Skybox.h" #include "Game.h" extern float viewdistance; diff --git a/Source/Skybox.h b/Source/Environment/Skybox.h similarity index 88% rename from Source/Skybox.h rename to Source/Environment/Skybox.h index 5619a2a..d2b5d72 100644 --- a/Source/Skybox.h +++ b/Source/Environment/Skybox.h @@ -21,11 +21,11 @@ along with Lugaru. If not, see . #ifndef _SKYBOX_H_ #define _SKYBOX_H_ -#include "Quaternions.h" -#include "ImageIO.h" -#include "Quaternions.h" -#include "gamegl.h" -#include "Texture.h" +#include "Graphic/gamegl.h" +#include "Graphic/Texture.h" +#include "Math/Quaternions.h" +#include "Math/Quaternions.h" +#include "Utils/ImageIO.h" class SkyBox { diff --git a/Source/Terrain.cpp b/Source/Environment/Terrain.cpp similarity index 99% rename from Source/Terrain.cpp rename to Source/Environment/Terrain.cpp index 34da00e..8c79cd4 100644 --- a/Source/Terrain.cpp +++ b/Source/Environment/Terrain.cpp @@ -19,8 +19,8 @@ along with Lugaru. If not, see . */ #include "Game.h" -#include "Terrain.h" -#include "Objects.h" +#include "Environment/Terrain.h" +#include "Objects/Objects.h" #include "Utils/Folders.h" extern XYZ viewer; diff --git a/Source/Terrain.h b/Source/Environment/Terrain.h similarity index 95% rename from Source/Terrain.h rename to Source/Environment/Terrain.h index c375687..f9319f7 100644 --- a/Source/Terrain.h +++ b/Source/Environment/Terrain.h @@ -21,13 +21,13 @@ along with Lugaru. If not, see . #ifndef _TERRAIN_H_ #define _TERRAIN_H_ -#include "gamegl.h" -#include "Frustum.h" -#include "Lights.h" -#include "ImageIO.h" -#include "Quaternions.h" -#include "Quaternions.h" -#include "Texture.h" +#include "Environment/Lights.h" +#include "Graphic/gamegl.h" +#include "Graphic/Texture.h" +#include "Math/Frustum.h" +#include "Math/Quaternions.h" +#include "Math/Quaternions.h" +#include "Utils/ImageIO.h" #define max_terrain_size 256 #define curr_terrain_size size diff --git a/Source/Game.cpp b/Source/Game.cpp index d05bb44..e740aa6 100644 --- a/Source/Game.cpp +++ b/Source/Game.cpp @@ -18,10 +18,11 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Game.h" -#include "openal_wrapper.h" #include "SDL_thread.h" -#include "Dialog.h" +#include "Game.h" +#include "Audio/openal_wrapper.h" +#include "Level/Dialog.h" + extern int mainmenu; diff --git a/Source/Game.h b/Source/Game.h index 2dbc9af..176d245 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -23,26 +23,26 @@ along with Lugaru. If not, see . #include "SDL.h" -#include "ImageIO.h" - -#include "Terrain.h" -#include "Skybox.h" #include "Animation/Skeleton.h" -#include "Models.h" -#include "Lights.h" -#include "Person.h" -#include "Sprite.h" -#include "Text.h" -#include "Objects.h" -#include "Weapons.h" -#include "binio.h" +#include "Audio/Sounds.h" +#include "Environment/Lights.h" +#include "Environment/Skybox.h" +#include "Environment/Terrain.h" +#include "Graphic/gamegl.h" +#include "Graphic/Models.h" +#include "Graphic/Sprite.h" +#include "Graphic/Stereo.h" +#include "Graphic/Text.h" +#include "Graphic/Texture.h" +#include "Objects/Objects.h" +#include "Objects/Person.h" +#include "Objects/Weapons.h" +#include "Thirdparty/optionparser.h" +#include "User/Account.h" +#include "Utils/binio.h" +#include "Utils/ImageIO.h" + #include -#include "gamegl.h" -#include "Stereo.h" -#include "Account.h" -#include "Sounds.h" -#include "Texture.h" -#include "optionparser.h" #define NB_CAMPAIGN_MENU_ITEM 7 diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index a346f23..d46b9b6 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -19,12 +19,12 @@ along with Lugaru. If not, see . */ #include "Game.h" -#include "openal_wrapper.h" -#include "Input.h" -#include "Awards.h" -#include "Menu.h" -#include "Dialog.h" -#include "Hotspot.h" +#include "Audio/openal_wrapper.h" +#include "Level/Awards.h" +#include "Level/Dialog.h" +#include "Level/Hotspot.h" +#include "Menu/Menu.h" +#include "Utils/Input.h" extern XYZ viewer; extern int environment; diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index c070d29..036f80f 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -19,11 +19,11 @@ along with Lugaru. If not, see . */ #include "Game.h" -#include "openal_wrapper.h" #include "Animation/Animation.h" -#include "Texture.h" +#include "Audio/openal_wrapper.h" +#include "Graphic/Texture.h" +#include "Menu/Menu.h" #include "Utils/Folders.h" -#include "Menu.h" extern float screenwidth, screenheight; extern float viewdistance; diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index 1b865f1..37a29f5 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -35,17 +35,17 @@ along with Lugaru. If not, see . #include #include #include "Game.h" -#include "openal_wrapper.h" -#include "Settings.h" -#include "Input.h" #include "Animation/Animation.h" -#include "Awards.h" -#include "Menu.h" -#include "ConsoleCmds.h" -#include "Dialog.h" +#include "Audio/openal_wrapper.h" +#include "Devtools/ConsoleCmds.h" +#include "Level/Awards.h" +#include "Level/Campaign.h" +#include "Level/Dialog.h" +#include "Level/Hotspot.h" +#include "Menu/Menu.h" +#include "User/Settings.h" #include "Utils/Folders.h" -#include "Hotspot.h" -#include "Campaign.h" +#include "Utils/Input.h" #include #include diff --git a/Source/Globals.cpp b/Source/Globals.cpp index d8d430d..66c6c9b 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -20,21 +20,11 @@ along with Lugaru. If not, see . #include "SDL.h" -#include "gamegl.h" -#include "Quaternions.h" -#include "Lights.h" -#include "Animation/Animation.h" -#include "Animation/Skeleton.h" -#include "Terrain.h" -#include "Sprite.h" -#include "Frustum.h" -#include "Objects.h" -#include "Weapons.h" -#include "Person.h" -#include "ImageIO.h" -#include "openal_wrapper.h" -#include "Stereo.h" +#include +#include "Graphic/Stereo.h" +#include "Math/Quaternions.h" +#include "Objects/Weapons.h" bool visibleloading = 0; diff --git a/Source/Models.cpp b/Source/Graphic/Models.cpp similarity index 99% rename from Source/Models.cpp rename to Source/Graphic/Models.cpp index 2c30168..a9833d0 100644 --- a/Source/Models.cpp +++ b/Source/Graphic/Models.cpp @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ #include "Game.h" -#include "Models.h" +#include "Graphic/Models.h" #include "Utils/Folders.h" extern float multiplier; diff --git a/Source/Models.h b/Source/Graphic/Models.h similarity index 96% rename from Source/Models.h rename to Source/Graphic/Models.h index 3874e23..e14ebe6 100644 --- a/Source/Models.h +++ b/Source/Graphic/Models.h @@ -25,16 +25,16 @@ along with Lugaru. If not, see . // // Model Maximums // -#include "gamegl.h" +#include "Graphic/gamegl.h" #include #include #include #include -#include "Terrain.h" -#include "binio.h" -#include "Quaternions.h" -#include "Texture.h" +#include "Environment/Terrain.h" +#include "Graphic/Texture.h" +#include "Math/Quaternions.h" +#include "Utils/binio.h" // // Textures List diff --git a/Source/Sprite.cpp b/Source/Graphic/Sprite.cpp similarity index 99% rename from Source/Sprite.cpp rename to Source/Graphic/Sprite.cpp index a0502d2..4276ce5 100644 --- a/Source/Sprite.cpp +++ b/Source/Graphic/Sprite.cpp @@ -18,9 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Sprite.h" -#include "Person.h" #include "Game.h" +#include "Graphic/Sprite.h" +#include "Objects/Person.h" + extern XYZ viewer; extern float viewdistance; extern float fadestart; diff --git a/Source/Sprite.h b/Source/Graphic/Sprite.h similarity index 90% rename from Source/Sprite.h rename to Source/Graphic/Sprite.h index 6f679ce..bed8439 100644 --- a/Source/Sprite.h +++ b/Source/Graphic/Sprite.h @@ -21,15 +21,15 @@ along with Lugaru. If not, see . #ifndef _SPRITE_H_ #define _SPRITE_H_ -#include "Quaternions.h" -#include "gamegl.h" -#include "ImageIO.h" -#include "Quaternions.h" -#include "Frustum.h" -#include "Lights.h" -#include "Terrain.h" -#include "Objects.h" -#include "Texture.h" +#include "Environment/Lights.h" +#include "Environment/Terrain.h" +#include "Graphic/gamegl.h" +#include "Graphic/Texture.h" +#include "Math/Frustum.h" +#include "Math/Quaternions.h" +#include "Math/Quaternions.h" +#include "Objects/Objects.h" +#include "Utils/ImageIO.h" #include diff --git a/Source/Stereo.cpp b/Source/Graphic/Stereo.cpp similarity index 99% rename from Source/Stereo.cpp rename to Source/Graphic/Stereo.cpp index 8887a52..efb300b 100644 --- a/Source/Stereo.cpp +++ b/Source/Graphic/Stereo.cpp @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ #include "Game.h" -#include "Stereo.h" +#include "Graphic/Stereo.h" extern int kContextWidth; diff --git a/Source/Stereo.h b/Source/Graphic/Stereo.h similarity index 100% rename from Source/Stereo.h rename to Source/Graphic/Stereo.h diff --git a/Source/Text.cpp b/Source/Graphic/Text.cpp similarity index 99% rename from Source/Text.cpp rename to Source/Graphic/Text.cpp index 0a31c3e..31bbe9f 100644 --- a/Source/Text.cpp +++ b/Source/Graphic/Text.cpp @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ /**> HEADER FILES <**/ -#include "Text.h" +#include "Graphic/Text.h" #include "Game.h" void Text::LoadFontTexture(const std::string& fileName) diff --git a/Source/Text.h b/Source/Graphic/Text.h similarity index 93% rename from Source/Text.h rename to Source/Graphic/Text.h index c2a2ccc..b5cc8a1 100644 --- a/Source/Text.h +++ b/Source/Graphic/Text.h @@ -21,14 +21,11 @@ along with Lugaru. If not, see . #ifndef _TEXT_H_ #define _TEXT_H_ - /**> HEADER FILES <**/ -#include "Quaternions.h" -//#include "Files.h" -#include "Quaternions.h" -#include "gamegl.h" -#include "ImageIO.h" -#include "Texture.h" +#include "Graphic/gamegl.h" +#include "Graphic/Texture.h" +#include "Math/Quaternions.h" +#include "Utils/ImageIO.h" class Text { diff --git a/Source/Texture.cpp b/Source/Graphic/Texture.cpp similarity index 97% rename from Source/Texture.cpp rename to Source/Graphic/Texture.cpp index 3106c8f..3f5211a 100644 --- a/Source/Texture.cpp +++ b/Source/Graphic/Texture.cpp @@ -18,10 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "gamegl.h" -#include "Texture.h" -#include "ImageIO.h" +#include "Graphic/gamegl.h" +#include "Graphic/Texture.h" #include "Utils/Folders.h" +#include "Utils/ImageIO.h" using namespace std; diff --git a/Source/Texture.h b/Source/Graphic/Texture.h similarity index 100% rename from Source/Texture.h rename to Source/Graphic/Texture.h diff --git a/Source/gamegl.h b/Source/Graphic/gamegl.h similarity index 100% rename from Source/gamegl.h rename to Source/Graphic/gamegl.h diff --git a/Source/Awards.cpp b/Source/Level/Awards.cpp similarity index 98% rename from Source/Awards.cpp rename to Source/Level/Awards.cpp index 5b27563..0a561e5 100644 --- a/Source/Awards.cpp +++ b/Source/Level/Awards.cpp @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Awards.h" -#include "Person.h" +#include "Level/Awards.h" +#include "Objects/Person.h" #include "Game.h" int bonus; diff --git a/Source/Awards.def b/Source/Level/Awards.def similarity index 100% rename from Source/Awards.def rename to Source/Level/Awards.def diff --git a/Source/Awards.h b/Source/Level/Awards.h similarity index 100% rename from Source/Awards.h rename to Source/Level/Awards.h diff --git a/Source/Bonuses.def b/Source/Level/Bonuses.def similarity index 100% rename from Source/Bonuses.def rename to Source/Level/Bonuses.def diff --git a/Source/Campaign.cpp b/Source/Level/Campaign.cpp similarity index 99% rename from Source/Campaign.cpp rename to Source/Level/Campaign.cpp index fd75198..2aa5f17 100644 --- a/Source/Campaign.cpp +++ b/Source/Level/Campaign.cpp @@ -18,9 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Campaign.h" #include "Game.h" +#include "Level/Campaign.h" #include "Utils/Folders.h" + #include using namespace Game; diff --git a/Source/Campaign.h b/Source/Level/Campaign.h similarity index 98% rename from Source/Campaign.h rename to Source/Level/Campaign.h index 05c7859..3cd4d51 100644 --- a/Source/Campaign.h +++ b/Source/Level/Campaign.h @@ -21,7 +21,7 @@ along with Lugaru. If not, see . #include #include -#include "Quaternions.h" +#include "Math/Quaternions.h" extern bool campaign; diff --git a/Source/Dialog.cpp b/Source/Level/Dialog.cpp similarity index 98% rename from Source/Dialog.cpp rename to Source/Level/Dialog.cpp index 1f3adc5..915fba1 100644 --- a/Source/Dialog.cpp +++ b/Source/Level/Dialog.cpp @@ -18,12 +18,13 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Dialog.h" -#include "Person.h" -#include "Input.h" #include "Game.h" -#include "binio.h" + +#include "Level/Dialog.h" +#include "Objects/Person.h" +#include "Utils/binio.h" #include "Utils/Folders.h" +#include "Utils/Input.h" extern int hostile; diff --git a/Source/Dialog.h b/Source/Level/Dialog.h similarity index 98% rename from Source/Dialog.h rename to Source/Level/Dialog.h index 59c791e..50691c5 100644 --- a/Source/Dialog.h +++ b/Source/Level/Dialog.h @@ -22,9 +22,10 @@ along with Lugaru. If not, see . #define _DIALOG_H_ #include "stdio.h" -#include "Quaternions.h" #include +#include "Math/Quaternions.h" + class DialogScene { public: diff --git a/Source/Hotspot.cpp b/Source/Level/Hotspot.cpp similarity index 97% rename from Source/Hotspot.cpp rename to Source/Level/Hotspot.cpp index 03bf3a1..1f7956e 100644 --- a/Source/Hotspot.cpp +++ b/Source/Level/Hotspot.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Hotspot.h" +#include "Level/Hotspot.h" std::vector Hotspot::hotspots; int Hotspot::current = 0; diff --git a/Source/Hotspot.h b/Source/Level/Hotspot.h similarity index 97% rename from Source/Hotspot.h rename to Source/Level/Hotspot.h index 3139f98..a8ef2ec 100644 --- a/Source/Hotspot.h +++ b/Source/Level/Hotspot.h @@ -21,7 +21,7 @@ along with Lugaru. If not, see . #ifndef _HOTSPOT_H_ #define _HOTSPOT_H_ -#include "Quaternions.h" +#include "Math/Quaternions.h" #include class Hotspot diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h index 5d6f955..26b0b60 100644 --- a/Source/MacCompatibility.h +++ b/Source/MacCompatibility.h @@ -58,7 +58,7 @@ typedef signed char SInt8; typedef unsigned int UInt32; -#include "Random.h" +#include "Math/Random.h" typedef struct AbsoluteTime { unsigned long hi; diff --git a/Source/Frustum.cpp b/Source/Math/Frustum.cpp similarity index 99% rename from Source/Frustum.cpp rename to Source/Math/Frustum.cpp index b5f2129..164074b 100644 --- a/Source/Frustum.cpp +++ b/Source/Math/Frustum.cpp @@ -18,10 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Frustum.h" +#include "Math/Frustum.h" #include -#include "gamegl.h" +#include "Graphic/gamegl.h" void FRUSTUM:: diff --git a/Source/Frustum.h b/Source/Math/Frustum.h similarity index 100% rename from Source/Frustum.h rename to Source/Math/Frustum.h diff --git a/Source/PhysicsMath.h b/Source/Math/PhysicsMath.h similarity index 100% rename from Source/PhysicsMath.h rename to Source/Math/PhysicsMath.h diff --git a/Source/Quaternions.cpp b/Source/Math/Quaternions.cpp similarity index 99% rename from Source/Quaternions.cpp rename to Source/Math/Quaternions.cpp index ff1ad71..7e68b97 100644 --- a/Source/Quaternions.cpp +++ b/Source/Math/Quaternions.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Quaternions.h" +#include "Math/Quaternions.h" // Functions quaternion Quat_Mult(quaternion q1, quaternion q2) diff --git a/Source/Quaternions.h b/Source/Math/Quaternions.h similarity index 99% rename from Source/Quaternions.h rename to Source/Math/Quaternions.h index f090ef9..de07302 100644 --- a/Source/Quaternions.h +++ b/Source/Math/Quaternions.h @@ -24,7 +24,7 @@ along with Lugaru. If not, see . #include "math.h" #include "PhysicsMath.h" -#include "gamegl.h" +#include "Graphic/gamegl.h" /**> Quaternion Structures <**/ #define PI 3.14159265355555897932384626 diff --git a/Source/Random.h b/Source/Math/Random.h similarity index 100% rename from Source/Random.h rename to Source/Math/Random.h diff --git a/Source/Menu.cpp b/Source/Menu/Menu.cpp similarity index 99% rename from Source/Menu.cpp rename to Source/Menu/Menu.cpp index f1fb94f..3639740 100644 --- a/Source/Menu.cpp +++ b/Source/Menu/Menu.cpp @@ -21,16 +21,16 @@ along with Lugaru. If not, see . #include #include #include -#include "gamegl.h" -#include "Menu.h" -#include "Settings.h" -#include "Input.h" -#include "Campaign.h" +#include "Graphic/gamegl.h" +#include "Level/Campaign.h" +#include "Menu/Menu.h" +#include "User/Settings.h" +#include "Utils/Input.h" // Should not be needed, Menu should call methods from other classes to launch maps and challenges and so on -#include "Awards.h" -#include "openal_wrapper.h" +#include "Level/Awards.h" +#include "Audio/openal_wrapper.h" using namespace Game; diff --git a/Source/Menu.h b/Source/Menu/Menu.h similarity index 100% rename from Source/Menu.h rename to Source/Menu/Menu.h diff --git a/Source/Objects.cpp b/Source/Objects/Objects.cpp similarity index 99% rename from Source/Objects.cpp rename to Source/Objects/Objects.cpp index dd4f4a7..20e117c 100644 --- a/Source/Objects.cpp +++ b/Source/Objects/Objects.cpp @@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Objects.h" +#include "Objects/Objects.h" + extern XYZ viewer; extern float viewdistance; extern float fadestart; diff --git a/Source/Objects.h b/Source/Objects/Objects.h similarity index 88% rename from Source/Objects.h rename to Source/Objects/Objects.h index 8b5f592..83f17c2 100644 --- a/Source/Objects.h +++ b/Source/Objects/Objects.h @@ -21,16 +21,17 @@ along with Lugaru. If not, see . #ifndef _OBJECTS_H_ #define _OBJECTS_H_ -#include "Quaternions.h" -#include "gamegl.h" -#include "ImageIO.h" -#include "Quaternions.h" -#include "Frustum.h" -#include "Lights.h" -#include "Models.h" -#include "Terrain.h" -#include "Sprite.h" -#include "Texture.h" +#include "Environment/Lights.h" +#include "Environment/Terrain.h" +#include "Graphic/gamegl.h" +#include "Graphic/Models.h" +#include "Graphic/Sprite.h" +#include "Graphic/Texture.h" +#include "Math/Frustum.h" +#include "Math/Quaternions.h" +#include "Math/Quaternions.h" +#include "Utils/ImageIO.h" + #include // // Model Structures diff --git a/Source/Person.cpp b/Source/Objects/Person.cpp similarity index 99% rename from Source/Person.cpp rename to Source/Objects/Person.cpp index fb3c445..c1eb88d 100644 --- a/Source/Person.cpp +++ b/Source/Objects/Person.cpp @@ -19,15 +19,16 @@ along with Lugaru. If not, see . */ /**> HEADER FILES <**/ -#include "Person.h" -#include "openal_wrapper.h" #include "Animation/Animation.h" -#include "Sounds.h" -#include "Awards.h" -#include "Game.h" -#include "Dialog.h" +#include "Audio/openal_wrapper.h" +#include "Audio/Sounds.h" +#include "Level/Awards.h" +#include "Level/Dialog.h" +#include "Objects/Person.h" #include "Utils/Folders.h" +#include "Game.h" + extern float multiplier; extern Terrain terrain; extern float gravity; diff --git a/Source/Person.h b/Source/Objects/Person.h similarity index 98% rename from Source/Person.h rename to Source/Objects/Person.h index cb62622..4fa115f 100644 --- a/Source/Person.h +++ b/Source/Objects/Person.h @@ -22,17 +22,17 @@ along with Lugaru. If not, see . #define _PERSON_H_ /**> HEADER FILES <**/ - -#include "gamegl.h" -#include "Quaternions.h" +#include "Animation/Animation.h" #include "Animation/Skeleton.h" -#include "Models.h" -#include "Terrain.h" -#include "Sprite.h" -#include +#include "Environment/Terrain.h" +#include "Graphic/gamegl.h" +#include "Graphic/Models.h" +#include "Graphic/Sprite.h" +#include "Math/Quaternions.h" +#include "Objects/Weapons.h" + #include -#include "Weapons.h" -#include "Animation/Animation.h" +#include #define passivetype 0 #define guardtype 1 diff --git a/Source/Weapons.cpp b/Source/Objects/Weapons.cpp similarity index 99% rename from Source/Weapons.cpp rename to Source/Objects/Weapons.cpp index bc610d7..c56779d 100644 --- a/Source/Weapons.cpp +++ b/Source/Objects/Weapons.cpp @@ -21,12 +21,13 @@ along with Lugaru. If not, see . */ /**> HEADER FILES <**/ -#include "Weapons.h" -#include "openal_wrapper.h" #include "Animation/Animation.h" -#include "Sounds.h" +#include "Audio/openal_wrapper.h" +#include "Audio/Sounds.h" +#include "Level/Awards.h" +#include "Objects/Weapons.h" + #include "Game.h" -#include "Awards.h" extern float multiplier; extern Terrain terrain; diff --git a/Source/Weapons.h b/Source/Objects/Weapons.h similarity index 93% rename from Source/Weapons.h rename to Source/Objects/Weapons.h index 7472541..51ab000 100644 --- a/Source/Weapons.h +++ b/Source/Objects/Weapons.h @@ -22,15 +22,15 @@ along with Lugaru. If not, see . #define _WEAPONS_H_ /**> HEADER FILES <**/ - -#include "gamegl.h" -#include "Quaternions.h" #include "Animation/Skeleton.h" -#include "Models.h" -#include "Terrain.h" -#include "Sprite.h" -#include "Person.h" -#include "Texture.h" +#include "Environment/Terrain.h" +#include "Graphic/gamegl.h" +#include "Graphic/Models.h" +#include "Graphic/Sprite.h" +#include "Graphic/Texture.h" +#include "Math/Quaternions.h" +#include "Objects/Person.h" + #include #define max_weapons 30 diff --git a/Source/optionparser.h b/Source/Thirdparty/optionparser.h similarity index 99% rename from Source/optionparser.h rename to Source/Thirdparty/optionparser.h index a5a8e19..2e178ce 100644 --- a/Source/optionparser.h +++ b/Source/Thirdparty/optionparser.h @@ -43,15 +43,15 @@ * @brief This is the only file required to use The Lean Mean C++ Option Parser. * Just \#include it and you're set. * - * The Lean Mean C++ Option Parser handles the program's command line arguments + * The Lean Mean C++ Option Parser handles the program's command line arguments * (argc, argv). - * It supports the short and long option formats of getopt(), getopt_long() + * It supports the short and long option formats of getopt(), getopt_long() * and getopt_long_only() but has a more convenient interface. * The following features set it apart from other option parsers: * * @par Highlights: *
    - *
  • It is a header-only library. Just \#include "optionparser.h" and you're set. + *
  • It is a header-only library. Just \#include "Thirdparty/optionparser.h" and you're set. *
  • It is freestanding. There are no dependencies whatsoever, not even the * C or C++ standard library. *
  • It has a usage message formatter that supports column alignment and @@ -82,7 +82,7 @@ * @endcode *
* @n - * Despite these features the code size remains tiny. + * Despite these features the code size remains tiny. * It is smaller than uClibc's GNU getopt() and just a * couple 100 bytes larger than uClibc's SUSv3 getopt(). @n * (This does not include the usage formatter, of course. But you don't have to use that.) @@ -115,7 +115,7 @@ * @code * #error EXAMPLE SHORTENED FOR READABILITY. BETTER EXAMPLES ARE IN THE .TAR.GZ! * #include - * #include "optionparser.h" + * #include "Thirdparty/optionparser.h" * * enum optionIndex { UNKNOWN, HELP, PLUS }; * const option::Descriptor usage[] = @@ -1924,8 +1924,8 @@ struct PrintUsageImplementation int target_line_in_block; //!< Line index of the parts we should return to the user on this iteration. bool hit_target_line; //!< Flag whether we encountered a part with line index target_line_in_block in the current cell. - /** - * @brief Determines the byte and character lengths of the part at @ref ptr and + /** + * @brief Determines the byte and character lengths of the part at @ref ptr and * stores them in @ref len and @ref screenlen respectively. */ void update_length() diff --git a/Source/Account.cpp b/Source/User/Account.cpp similarity index 99% rename from Source/Account.cpp rename to Source/User/Account.cpp index 6a1d3bb..ff4b04f 100644 --- a/Source/Account.cpp +++ b/Source/User/Account.cpp @@ -18,10 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Account.h" -#include "binio.h" -#include +#include "User/Account.h" +#include "Utils/binio.h" #include "MacCompatibility.h" +#include #include "string.h" #include diff --git a/Source/Account.h b/Source/User/Account.h similarity index 100% rename from Source/Account.h rename to Source/User/Account.h diff --git a/Source/Settings.cpp b/Source/User/Settings.cpp similarity index 99% rename from Source/Settings.cpp rename to Source/User/Settings.cpp index eca9efd..9948e63 100644 --- a/Source/Settings.cpp +++ b/Source/User/Settings.cpp @@ -18,10 +18,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Settings.h" #include "Game.h" -#include "Input.h" +#include "User/Settings.h" #include "Utils/Folders.h" +#include "Utils/Input.h" using namespace Game; diff --git a/Source/Settings.h b/Source/User/Settings.h similarity index 100% rename from Source/Settings.h rename to Source/User/Settings.h diff --git a/Source/ImageIO.cpp b/Source/Utils/ImageIO.cpp similarity index 99% rename from Source/ImageIO.cpp rename to Source/Utils/ImageIO.cpp index 3e6a72e..7a405fc 100644 --- a/Source/ImageIO.cpp +++ b/Source/Utils/ImageIO.cpp @@ -26,7 +26,7 @@ along with Lugaru. If not, see . #include #include "Game.h" -#include "ImageIO.h" +#include "Utils/ImageIO.h" #include "Utils/Folders.h" extern bool visibleloading; diff --git a/Source/ImageIO.h b/Source/Utils/ImageIO.h similarity index 98% rename from Source/ImageIO.h rename to Source/Utils/ImageIO.h index b3d0a49..0c587bf 100644 --- a/Source/ImageIO.h +++ b/Source/Utils/ImageIO.h @@ -37,7 +37,7 @@ along with Lugaru. If not, see . #undef Polygon #include "GL/gl.h" #else -#include "gamegl.h" +#include "Graphic/gamegl.h" #endif /**> DATA STRUCTURES <**/ diff --git a/Source/Input.cpp b/Source/Utils/Input.cpp similarity index 99% rename from Source/Input.cpp rename to Source/Utils/Input.cpp index b18ec6e..9376522 100644 --- a/Source/Input.cpp +++ b/Source/Utils/Input.cpp @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ /**> HEADER FILES <**/ -#include "Input.h" +#include "Utils/Input.h" bool keyDown[SDL_NUM_SCANCODES + 6]; bool keyPressed[SDL_NUM_SCANCODES + 6]; diff --git a/Source/Input.h b/Source/Utils/Input.h similarity index 100% rename from Source/Input.h rename to Source/Utils/Input.h diff --git a/Source/binio.h b/Source/Utils/binio.h similarity index 100% rename from Source/binio.h rename to Source/Utils/binio.h diff --git a/Source/pack.c b/Source/Utils/pack.c similarity index 100% rename from Source/pack.c rename to Source/Utils/pack.c diff --git a/Source/private.c b/Source/Utils/private.c similarity index 100% rename from Source/private.c rename to Source/Utils/private.c diff --git a/Source/private.h b/Source/Utils/private.h similarity index 100% rename from Source/private.h rename to Source/Utils/private.h diff --git a/Source/unpack.c b/Source/Utils/unpack.c similarity index 100% rename from Source/unpack.c rename to Source/Utils/unpack.c diff --git a/Source/WinDefs.h b/Source/WinDefs.h index 32c7945..3668453 100644 --- a/Source/WinDefs.h +++ b/Source/WinDefs.h @@ -48,7 +48,7 @@ typedef signed char SInt8; typedef unsigned int UInt32; -#include "Random.h" +#include "Math/Random.h" typedef struct AbsoluteTime { diff --git a/Source/main.cpp b/Source/main.cpp index 09a10cb..2144a8c 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -25,15 +25,15 @@ along with Lugaru. If not, see . #include #include #include -#include "gamegl.h" #include "MacCompatibility.h" -#include "Settings.h" +#include "Graphic/gamegl.h" +#include "User/Settings.h" #include "Game.h" using namespace Game; -#include "openal_wrapper.h" +#include "Audio/openal_wrapper.h" #ifdef WIN32 #include -- 2.39.2