Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-15 06:52:34 +02:00
Code Issues Projects Releases Activity

rwlib: rw/defines.hpp -> rw/debug.hpp

Browse Source
This commit is contained in:
Anonymous Maarten 2018-06-21 16:49:05 +02:00
parent 0b8407b618
commit 36149cf38e
40 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rwengine/src/BinaryStream.cpp
View File

@ -2,7 +2,7 @@
#include <cstring> #include <cstring>
#include <fstream> #include <fstream>
#include <rw/defines.hpp> #include <rw/debug.hpp>
namespace RW { namespace RW {

2
rwengine/src/TextureArchive.cpp
View File

@ -4,7 +4,7 @@
#include <cstring> #include <cstring>
#include <memory> #include <memory>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "BinaryStream.hpp" #include "BinaryStream.hpp"

2
rwengine/src/ai/AIGraph.cpp
View File

@ -7,7 +7,7 @@
#include "ai/AIGraphNode.hpp" #include "ai/AIGraphNode.hpp"
#include "data/PathData.hpp" #include "data/PathData.hpp"
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/types.hpp> #include <rw/types.hpp>
AIGraph::~AIGraph() { AIGraph::~AIGraph() {

2
rwengine/src/ai/CharacterController.cpp
View File

@ -11,7 +11,7 @@
#include <LinearMath/btScalar.h> #include <LinearMath/btScalar.h>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "data/WeaponData.hpp" #include "data/WeaponData.hpp"
#include "engine/Animator.hpp" #include "engine/Animator.hpp"

2
rwengine/src/audio/SoundManager.cpp
View File

@ -8,7 +8,7 @@ extern "C" {
#include <libavutil/avutil.h> #include <libavutil/avutil.h>
} }
//ab //ab
#include <rw/defines.hpp> #include <rw/debug.hpp>
// Rename some functions for older libavcodec/ffmpeg versions (e.g. Ubuntu Trusty) // Rename some functions for older libavcodec/ffmpeg versions (e.g. Ubuntu Trusty)
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1) #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)

2
rwengine/src/core/Profiler.hpp
View File

@ -9,7 +9,7 @@
#include <vector> #include <vector>
#define time_unit std::chrono::microseconds #define time_unit std::chrono::microseconds
#include <rw/defines.hpp> #include <rw/debug.hpp>
namespace perf { namespace perf {

2
rwengine/src/data/AnimGroup.cpp
View File

@ -3,7 +3,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/forward.hpp> #include <rw/forward.hpp>
// The default animations for every cycle // The default animations for every cycle

2
rwengine/src/data/Chase.cpp
View File

@ -4,7 +4,7 @@
#include <cstddef> #include <cstddef>
#include <fstream> #include <fstream>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "engine/GameWorld.hpp" #include "engine/GameWorld.hpp"
#include "objects/GameObject.hpp" #include "objects/GameObject.hpp"

2
rwengine/src/data/ModelData.hpp
View File

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include <data/Clump.hpp> #include <data/Clump.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/forward.hpp> #include <rw/forward.hpp>
#include <data/CollisionModel.hpp> #include <data/CollisionModel.hpp>

2
rwengine/src/engine/Animator.hpp
View File

@ -3,7 +3,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/forward.hpp> #include <rw/forward.hpp>
struct AnimationBone; struct AnimationBone;

2
rwengine/src/engine/GameData.cpp
View File

@ -13,7 +13,7 @@
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <data/Clump.hpp> #include <data/Clump.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/types.hpp> #include <rw/types.hpp>
#include "core/Logger.hpp" #include "core/Logger.hpp"

2
rwengine/src/engine/GameData.hpp
View File

@ -14,7 +14,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <platform/FileIndex.hpp> #include <platform/FileIndex.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/forward.hpp> #include <rw/forward.hpp>
#include <data/AnimGroup.hpp> #include <data/AnimGroup.hpp>

8
rwengine/src/engine/Garage.hpp
View File

@ -1,9 +1,9 @@
#ifndef _RWENGINE_Garage_HPP_ #ifndef _RWENGINE_GARAGE_HPP_
#define _RWENGINE_Garage_HPP_ #define _RWENGINE_GARAGE_HPP_
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
class PlayerController; class PlayerController;
@ -109,4 +109,4 @@ public:
void tick(float dt); void tick(float dt);
}; };
#endif #endif

2
rwengine/src/engine/Payphone.cpp
View File

@ -1,6 +1,6 @@
#include "engine/Payphone.hpp" #include "engine/Payphone.hpp"
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "ai/PlayerController.hpp" #include "ai/PlayerController.hpp"

2
rwengine/src/engine/SaveGame.cpp
View File

@ -12,7 +12,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "data/ZoneData.hpp" #include "data/ZoneData.hpp"
#include "engine/GameData.hpp" #include "engine/GameData.hpp"

2
rwengine/src/engine/ScreenText.cpp
View File

@ -1,6 +1,6 @@
#include "engine/ScreenText.hpp" #include "engine/ScreenText.hpp"
#include <rw/defines.hpp> #include <rw/debug.hpp>
void ScreenText::tick(float dt) { void ScreenText::tick(float dt) {
int millis = dt * 1000; int millis = dt * 1000;

2
rwengine/src/loaders/GenericDATLoader.cpp
View File

@ -6,7 +6,7 @@
#include <iterator> #include <iterator>
#include <sstream> #include <sstream>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <data/ModelData.hpp> #include <data/ModelData.hpp>
#include <data/WeaponData.hpp> #include <data/WeaponData.hpp>

2
rwengine/src/loaders/LoaderCutsceneDAT.cpp
View File

@ -7,7 +7,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "data/CutsceneData.hpp" #include "data/CutsceneData.hpp"
#include "platform/FileHandle.hpp" #include "platform/FileHandle.hpp"

2
rwengine/src/objects/CharacterObject.cpp
View File

@ -9,7 +9,7 @@
#include <BulletDynamics/Character/btKinematicCharacterController.h> #include <BulletDynamics/Character/btKinematicCharacterController.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "ai/CharacterController.hpp" #include "ai/CharacterController.hpp"
#include "ai/PlayerController.hpp" #include "ai/PlayerController.hpp"

2
rwengine/src/objects/GameObject.hpp
View File

@ -7,7 +7,7 @@
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/forward.hpp> #include <rw/forward.hpp>
#include <data/ModelData.hpp> #include <data/ModelData.hpp>

2
rwengine/src/objects/PickupObject.hpp
View File

@ -4,7 +4,7 @@
#include <cstdint> #include <cstdint>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <objects/GameObject.hpp> #include <objects/GameObject.hpp>

2
rwengine/src/render/DebugDraw.cpp
View File

@ -9,7 +9,7 @@
#include <gl/DrawBuffer.hpp> #include <gl/DrawBuffer.hpp>
#include <gl/GeometryBuffer.hpp> #include <gl/GeometryBuffer.hpp>
#include <gl/gl_core_3_3.h> #include <gl/gl_core_3_3.h>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "render/GameRenderer.hpp" #include "render/GameRenderer.hpp"

2
rwengine/src/render/OpenGLRenderer.cpp
View File

@ -7,7 +7,7 @@
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <gl/DrawBuffer.hpp> #include <gl/DrawBuffer.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
namespace { namespace {
constexpr GLuint kUBOIndexScene = 1; constexpr GLuint kUBOIndexScene = 1;

2
rwengine/src/render/WaterRenderer.cpp
View File

@ -4,7 +4,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/types.hpp> #include <rw/types.hpp>
#include "engine/GameData.hpp" #include "engine/GameData.hpp"

2
rwengine/src/script/ScriptFunctions.hpp
View File

@ -1,7 +1,7 @@
#ifndef _RWENGINE_SCRIPTFUNCTIONS_HPP_ #ifndef _RWENGINE_SCRIPTFUNCTIONS_HPP_
#define _RWENGINE_SCRIPTFUNCTIONS_HPP_ #define _RWENGINE_SCRIPTFUNCTIONS_HPP_
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <ai/AIGraphNode.hpp> #include <ai/AIGraphNode.hpp>
#include <data/GameTexts.hpp> #include <data/GameTexts.hpp>

2
rwengine/src/script/ScriptTypes.hpp
View File

@ -9,7 +9,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "engine/Garage.hpp" #include "engine/Garage.hpp"

2
rwgame/GameBase.cpp
View File

@ -6,7 +6,7 @@
#include <SDL.h> #include <SDL.h>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "GitSHA1.h" #include "GitSHA1.h"

2
rwgame/GameConfig.cpp
View File

@ -1,7 +1,7 @@
#include "GameConfig.hpp" #include "GameConfig.hpp"
#include <algorithm> #include <algorithm>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/filesystem.hpp> #include <rw/filesystem.hpp>
#include <boost/property_tree/ini_parser.hpp> #include <boost/property_tree/ini_parser.hpp>

2
rwgame/MenuSystem.hpp
View File

@ -8,7 +8,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <render/GameRenderer.hpp> #include <render/GameRenderer.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
/** /**
* Default values for menus that should match the look and feel of the original * Default values for menus that should match the look and feel of the original

2
rwgame/states/MenuState.cpp
View File

@ -3,7 +3,7 @@
#include "game.hpp" #include "game.hpp"
#include <engine/SaveGame.hpp> #include <engine/SaveGame.hpp>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include "RWGame.hpp" #include "RWGame.hpp"
MenuState::MenuState(RWGame* game) : State(game) { MenuState::MenuState(RWGame* game) : State(game) {

2
rwlib/CMakeLists.txt
View File

@ -20,7 +20,7 @@ SET(RWLIB_SOURCES
source/rw/filesystem.hpp source/rw/filesystem.hpp
source/rw/forward.hpp source/rw/forward.hpp
source/rw/types.hpp source/rw/types.hpp
source/rw/defines.hpp source/rw/debug.hpp
source/platform/FileHandle.hpp source/platform/FileHandle.hpp
source/platform/FileIndex.hpp source/platform/FileIndex.hpp

2
rwlib/source/loaders/LoaderDFF.cpp
View File

@ -14,7 +14,7 @@
#include "gl/gl_core_3_3.h" #include "gl/gl_core_3_3.h"
#include "loaders/RWBinaryStream.hpp" #include "loaders/RWBinaryStream.hpp"
#include "platform/FileHandle.hpp" #include "platform/FileHandle.hpp"
#include "rw/defines.hpp" #include "rw/debug.hpp"
enum DFFChunks { enum DFFChunks {
CHUNK_STRUCT = 0x0001, CHUNK_STRUCT = 0x0001,

2
rwlib/source/loaders/LoaderIMG.cpp
View File

@ -3,7 +3,7 @@
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <cstdio> #include <cstdio>
#include "rw/defines.hpp" #include "rw/debug.hpp"
LoaderIMG::LoaderIMG() : m_version(GTAIIIVC), m_assetCount(0) { LoaderIMG::LoaderIMG() : m_version(GTAIIIVC), m_assetCount(0) {
} }

2
rwlib/source/loaders/LoaderSDT.cpp
View File

@ -4,7 +4,7 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include "rw/defines.hpp" #include "rw/debug.hpp"
LoaderSDT::LoaderSDT() : m_version(GTAIIIVC), m_assetCount(0) { LoaderSDT::LoaderSDT() : m_version(GTAIIIVC), m_assetCount(0) {
} }

2
rwlib/source/loaders/LoaderTXD.cpp
View File

@ -10,7 +10,7 @@
#include "gl/gl_core_3_3.h" #include "gl/gl_core_3_3.h"
#include "loaders/RWBinaryStream.hpp" #include "loaders/RWBinaryStream.hpp"
#include "platform/FileHandle.hpp" #include "platform/FileHandle.hpp"
#include "rw/defines.hpp" #include "rw/debug.hpp"
GLuint gErrorTextureData[] = {0xFFFF00FF, 0xFF000000, 0xFF000000, 0xFFFF00FF}; GLuint gErrorTextureData[] = {0xFFFF00FF, 0xFF000000, 0xFF000000, 0xFFFF00FF};
GLuint gDebugTextureData[] = {0xFF0000FF, 0xFF00FF00}; GLuint gDebugTextureData[] = {0xFF0000FF, 0xFF00FF00};

2
rwlib/source/loaders/RWBinaryStream.hpp
View File

@ -6,7 +6,7 @@
#include <cstddef> #include <cstddef>
#include "rw/defines.hpp" #include "rw/debug.hpp"
#include "rw/bit_cast.cpp" #include "rw/bit_cast.cpp"
/** /**

2
rwlib/source/rw/bit_cast.cpp
View File

@ -4,7 +4,7 @@
//Based on https://gist.github.com/socantre/3472964 //Based on https://gist.github.com/socantre/3472964
#include <cstring> // memcpy #include <cstring> // memcpy
#include <type_traits> // is_trivially_copyable #include <type_traits> // is_trivially_copyable
#include "rw/defines.hpp" // RW_ASSERT #include "rw/debug.hpp" // RW_ASSERT
template <class Dest, class Source> template <class Dest, class Source>
inline Dest bit_cast(Source const &source) { inline Dest bit_cast(Source const &source) {

4
rwlib/source/rw/defines.hpp → rwlib/source/rw/debug.hpp
View File

@ -1,5 +1,5 @@
#ifndef _LIBRW_DEFINES_HPP_ #ifndef _LIBRW_DEBUG_HPP_
#define _LIBRW_DEFINES_HPP_ #define _LIBRW_DEBUG_HPP_
#if RW_DEBUG #if RW_DEBUG
#include <cstdlib> #include <cstdlib>

2
rwlib/source/rw/types.hpp
View File

@ -5,7 +5,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <map> #include <map>
#include <memory> #include <memory>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <string> #include <string>
#define RW_USING(feature) 1 == feature #define RW_USING(feature) 1 == feature

2
tests/test_Config.cpp
View File

@ -8,7 +8,7 @@
#include <fstream> #include <fstream>
#include <map> #include <map>
#include <rw/defines.hpp> #include <rw/debug.hpp>
#include <rw/filesystem.hpp> #include <rw/filesystem.hpp>
namespace pt = boost::property_tree; namespace pt = boost::property_tree;