From bcfb2e119687997f835276c9984446dfc96446f8 Mon Sep 17 00:00:00 2001 From: turanszkij Date: Fri, 10 Jul 2015 23:44:51 +0200 Subject: [PATCH] Refactored file names --- WickedEngine/CommonInclude.h | 6 - WickedEngine/DirectInput.cpp | 2 +- WickedEngine/Renderable3DSceneComponent.h | 4 +- WickedEngine/RenderableComponent.h | 4 +- WickedEngine/WickedEngine.h | 57 +-- WickedEngine/WickedEngine.vcxproj | 142 +++--- WickedEngine/WickedEngine.vcxproj.filters | 432 +++++++++--------- WickedEngine/XInput.cpp | 2 +- WickedEngine/{BULLET.cpp => wiBULLET.cpp} | 4 +- WickedEngine/{BULLET.h => wiBULLET.h} | 2 +- WickedEngine/{BackLog.cpp => wiBackLog.cpp} | 10 +- WickedEngine/{BackLog.h => wiBackLog.h} | 4 +- WickedEngine/{Camera.cpp => wiCamera.cpp} | 2 +- WickedEngine/{Camera.h => wiCamera.h} | 0 WickedEngine/{Client.cpp => wiClient.cpp} | 2 +- WickedEngine/{Client.h => wiClient.h} | 2 +- WickedEngine/{CpuInfo.cpp => wiCpuInfo.cpp} | 2 +- WickedEngine/{CpuInfo.h => wiCpuInfo.h} | 0 WickedEngine/{Cube.cpp => wiCube.cpp} | 4 +- WickedEngine/{Cube.h => wiCube.h} | 9 + .../{VariableManager.cpp => wiCvar.cpp} | 2 +- WickedEngine/{VariableManager.h => wiCvar.h} | 0 .../{DepthTarget.cpp => wiDepthTarget.cpp} | 4 +- .../{DepthTarget.h => wiDepthTarget.h} | 0 WickedEngine/wiDirectInput.cpp | 287 ++++++++++++ .../{DirectInput.h => wiDirectInput.h} | 0 ...ttedParticle.cpp => wiEmittedParticle.cpp} | 14 +- ...{EmittedParticle.h => wiEmittedParticle.h} | 2 +- WickedEngine/{Font.cpp => wiFont.cpp} | 10 +- WickedEngine/{Font.h => wiFont.h} | 0 .../{FrameRate.cpp => wiFrameRate.cpp} | 2 +- WickedEngine/{FrameRate.h => wiFrameRate.h} | 2 +- WickedEngine/{Frustum.cpp => wiFrustum.cpp} | 2 +- WickedEngine/{Frustum.h => wiFrustum.h} | 0 .../{HairParticle.cpp => wiHairParticle.cpp} | 12 +- .../{HairParticle.h => wiHairParticle.h} | 2 +- .../{WickedHelper.cpp => wiHelper.cpp} | 2 +- WickedEngine/{WickedHelper.h => wiHelper.h} | 0 WickedEngine/{Hitbox2D.cpp => wiHitbox2D.cpp} | 2 +- WickedEngine/{Hitbox2D.h => wiHitbox2D.h} | 0 WickedEngine/{Image.cpp => wiImage.cpp} | 14 +- WickedEngine/{Image.h => wiImage.h} | 2 +- .../{ImageEffects.h => wiImageEffects.h} | 0 .../{InputManager.cpp => wiInputManager.cpp} | 6 +- .../{InputManager.h => wiInputManager.h} | 0 .../{LensFlare.cpp => wiLensFlare.cpp} | 6 +- WickedEngine/{LensFlare.h => wiLensFlare.h} | 0 WickedEngine/{Lines.cpp => wiLines.cpp} | 4 +- WickedEngine/{Lines.h => wiLines.h} | 0 .../{WickedLoader.cpp => wiLoader.cpp} | 18 +- WickedEngine/{WickedLoader.h => wiLoader.h} | 8 +- WickedEngine/{WickedMath.cpp => wiMath.cpp} | 2 +- WickedEngine/{WickedMath.h => wiMath.h} | 0 WickedEngine/{Network.cpp => wiNetwork.cpp} | 2 +- WickedEngine/{Network.h => wiNetwork.h} | 2 +- WickedEngine/{PHYSICS.h => wiPHYSICS.h} | 2 +- WickedEngine/{Particle.cpp => wiParticle.cpp} | 2 +- WickedEngine/{Particle.h => wiParticle.h} | 4 +- .../{RenderTarget.cpp => wiRenderTarget.cpp} | 6 +- .../{RenderTarget.h => wiRenderTarget.h} | 0 WickedEngine/{Renderer.cpp => wiRenderer.cpp} | 30 +- WickedEngine/{Renderer.h => wiRenderer.h} | 12 +- ...ourceManager.cpp => wiResourceManager.cpp} | 10 +- ...{ResourceManager.h => wiResourceManager.h} | 0 WickedEngine/{SPTree.cpp => wiSPTree.cpp} | 8 +- WickedEngine/{SPTree.h => wiSPTree.h} | 2 +- WickedEngine/{Server.cpp => wiServer.cpp} | 2 +- WickedEngine/{Server.h => wiServer.h} | 2 +- WickedEngine/{Sound.cpp => wiSound.cpp} | 2 +- WickedEngine/{Sound.h => wiSound.h} | 0 WickedEngine/{Sprite.cpp => wiSprite.cpp} | 10 +- WickedEngine/{Sprite.h => wiSprite.h} | 4 +- WickedEngine/{TaskThread.h => wiTaskThread.h} | 0 ...{TextureHelper.cpp => wiTextureHelper.cpp} | 2 +- .../{TextureHelper.h => wiTextureHelper.h} | 2 +- WickedEngine/{Timer.cpp => wiTimer.cpp} | 4 +- WickedEngine/{Timer.h => wiTimer.h} | 0 WickedEngine/wiXInput.cpp | 52 +++ WickedEngine/{XInput.h => wiXInput.h} | 2 +- 79 files changed, 802 insertions(+), 453 deletions(-) rename WickedEngine/{BULLET.cpp => wiBULLET.cpp} (99%) rename WickedEngine/{BULLET.h => wiBULLET.h} (99%) rename WickedEngine/{BackLog.cpp => wiBackLog.cpp} (96%) rename WickedEngine/{BackLog.h => wiBackLog.h} (95%) rename WickedEngine/{Camera.cpp => wiCamera.cpp} (99%) rename WickedEngine/{Camera.h => wiCamera.h} (100%) rename WickedEngine/{Client.cpp => wiClient.cpp} (98%) rename WickedEngine/{Client.h => wiClient.h} (98%) rename WickedEngine/{CpuInfo.cpp => wiCpuInfo.cpp} (98%) rename WickedEngine/{CpuInfo.h => wiCpuInfo.h} (100%) rename WickedEngine/{Cube.cpp => wiCube.cpp} (97%) rename WickedEngine/{Cube.h => wiCube.h} (87%) rename WickedEngine/{VariableManager.cpp => wiCvar.cpp} (96%) rename WickedEngine/{VariableManager.h => wiCvar.h} (100%) rename WickedEngine/{DepthTarget.cpp => wiDepthTarget.cpp} (98%) rename WickedEngine/{DepthTarget.h => wiDepthTarget.h} (100%) create mode 100644 WickedEngine/wiDirectInput.cpp rename WickedEngine/{DirectInput.h => wiDirectInput.h} (100%) rename WickedEngine/{EmittedParticle.cpp => wiEmittedParticle.cpp} (99%) rename WickedEngine/{EmittedParticle.h => wiEmittedParticle.h} (99%) rename WickedEngine/{Font.cpp => wiFont.cpp} (99%) rename WickedEngine/{Font.h => wiFont.h} (100%) rename WickedEngine/{FrameRate.cpp => wiFrameRate.cpp} (95%) rename WickedEngine/{FrameRate.h => wiFrameRate.h} (91%) rename WickedEngine/{Frustum.cpp => wiFrustum.cpp} (99%) rename WickedEngine/{Frustum.h => wiFrustum.h} (100%) rename WickedEngine/{HairParticle.cpp => wiHairParticle.cpp} (99%) rename WickedEngine/{HairParticle.h => wiHairParticle.h} (98%) rename WickedEngine/{WickedHelper.cpp => wiHelper.cpp} (97%) rename WickedEngine/{WickedHelper.h => wiHelper.h} (100%) rename WickedEngine/{Hitbox2D.cpp => wiHitbox2D.cpp} (92%) rename WickedEngine/{Hitbox2D.h => wiHitbox2D.h} (100%) rename WickedEngine/{Image.cpp => wiImage.cpp} (99%) rename WickedEngine/{Image.h => wiImage.h} (97%) rename WickedEngine/{ImageEffects.h => wiImageEffects.h} (100%) rename WickedEngine/{InputManager.cpp => wiInputManager.cpp} (97%) rename WickedEngine/{InputManager.h => wiInputManager.h} (100%) rename WickedEngine/{LensFlare.cpp => wiLensFlare.cpp} (99%) rename WickedEngine/{LensFlare.h => wiLensFlare.h} (100%) rename WickedEngine/{Lines.cpp => wiLines.cpp} (97%) rename WickedEngine/{Lines.h => wiLines.h} (100%) rename WickedEngine/{WickedLoader.cpp => wiLoader.cpp} (99%) rename WickedEngine/{WickedLoader.h => wiLoader.h} (99%) rename WickedEngine/{WickedMath.cpp => wiMath.cpp} (99%) rename WickedEngine/{WickedMath.h => wiMath.h} (100%) rename WickedEngine/{Network.cpp => wiNetwork.cpp} (98%) rename WickedEngine/{Network.h => wiNetwork.h} (98%) rename WickedEngine/{PHYSICS.h => wiPHYSICS.h} (99%) rename WickedEngine/{Particle.cpp => wiParticle.cpp} (61%) rename WickedEngine/{Particle.h => wiParticle.h} (81%) rename WickedEngine/{RenderTarget.cpp => wiRenderTarget.cpp} (98%) rename WickedEngine/{RenderTarget.h => wiRenderTarget.h} (100%) rename WickedEngine/{Renderer.cpp => wiRenderer.cpp} (99%) rename WickedEngine/{Renderer.h => wiRenderer.h} (99%) rename WickedEngine/{ResourceManager.cpp => wiResourceManager.cpp} (97%) rename WickedEngine/{ResourceManager.h => wiResourceManager.h} (100%) rename WickedEngine/{SPTree.cpp => wiSPTree.cpp} (98%) rename WickedEngine/{SPTree.h => wiSPTree.h} (98%) rename WickedEngine/{Server.cpp => wiServer.cpp} (99%) rename WickedEngine/{Server.h => wiServer.h} (99%) rename WickedEngine/{Sound.cpp => wiSound.cpp} (99%) rename WickedEngine/{Sound.h => wiSound.h} (100%) rename WickedEngine/{Sprite.cpp => wiSprite.cpp} (96%) rename WickedEngine/{Sprite.h => wiSprite.h} (96%) rename WickedEngine/{TaskThread.h => wiTaskThread.h} (100%) rename WickedEngine/{TextureHelper.cpp => wiTextureHelper.cpp} (99%) rename WickedEngine/{TextureHelper.h => wiTextureHelper.h} (99%) rename WickedEngine/{Timer.cpp => wiTimer.cpp} (93%) rename WickedEngine/{Timer.h => wiTimer.h} (100%) create mode 100644 WickedEngine/wiXInput.cpp rename WickedEngine/{XInput.h => wiXInput.h} (97%) diff --git a/WickedEngine/CommonInclude.h b/WickedEngine/CommonInclude.h index bec77e9d3..08c34d214 100644 --- a/WickedEngine/CommonInclude.h +++ b/WickedEngine/CommonInclude.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -40,11 +39,6 @@ using namespace DirectX; using namespace std; -#include "Utility/WicTextureLoader.h" -#include "Utility/DDSTextureLoader.h" -#include "Utility/ScreenGrab.h" - - //TODO: REMOVE!!! #define XBOUNDS 10 #define CAMERA_POSITIONY 4.0f diff --git a/WickedEngine/DirectInput.cpp b/WickedEngine/DirectInput.cpp index 13668aa4d..785a4fada 100644 --- a/WickedEngine/DirectInput.cpp +++ b/WickedEngine/DirectInput.cpp @@ -1,4 +1,4 @@ -#include "DirectInput.h" +#include "wiDirectInput.h" #ifndef WINSTORE_SUPPORT diff --git a/WickedEngine/Renderable3DSceneComponent.h b/WickedEngine/Renderable3DSceneComponent.h index f67819f93..5e2b241ad 100644 --- a/WickedEngine/Renderable3DSceneComponent.h +++ b/WickedEngine/Renderable3DSceneComponent.h @@ -1,7 +1,7 @@ #pragma once #include "RenderableComponent.h" -#include "TaskThread.h" -#include "Renderer.h" +#include "wiTaskThread.h" +#include "wiRenderer.h" class Renderable3DSceneComponent : public RenderableComponent diff --git a/WickedEngine/RenderableComponent.h b/WickedEngine/RenderableComponent.h index 8fbd24596..4495d61b3 100644 --- a/WickedEngine/RenderableComponent.h +++ b/WickedEngine/RenderableComponent.h @@ -1,7 +1,7 @@ #pragma once #include "CommonInclude.h" -#include "RenderTarget.h" -#include "DepthTarget.h" +#include "wiRenderTarget.h" +#include "wiDepthTarget.h" class RenderableComponent { diff --git a/WickedEngine/WickedEngine.h b/WickedEngine/WickedEngine.h index 110dcc11d..b6df6550d 100644 --- a/WickedEngine/WickedEngine.h +++ b/WickedEngine/WickedEngine.h @@ -6,32 +6,32 @@ #ifndef WINSTORE_SUPPORT #include "mysql/mysql.h" #endif -#include "RenderTarget.h" -#include "DepthTarget.h" -#include "BackLog.h" -#include "Camera.h" -#include "Frustum.h" -#include "ImageEffects.h" -#include "Image.h" -#include "Sprite.h" -#include "Font.h" -#include "FrameRate.h" -#include "CpuInfo.h" -#include "WickedLoader.h" -#include "Particle.h" -#include "Renderer.h" -#include "DirectInput.h" -#include "XInput.h" -#include "TaskThread.h" -#include "WickedMath.h" -#include "LensFlare.h" -#include "Sound.h" -#include "ResourceManager.h" -#include "Timer.h" -#include "WickedHelper.h" -#include "InputManager.h" -#include "VariableManager.h" -#include "TextureHelper.h" +#include "wiRenderTarget.h" +#include "wiDepthTarget.h" +#include "wiBackLog.h" +#include "wiCamera.h" +#include "wiFrustum.h" +#include "wiImageEffects.h" +#include "wiImage.h" +#include "wiSprite.h" +#include "wiFont.h" +#include "wiFrameRate.h" +#include "wiCpuInfo.h" +#include "wiLoader.h" +#include "wiParticle.h" +#include "wiRenderer.h" +#include "wiDirectInput.h" +#include "wiXInput.h" +#include "wiTaskThread.h" +#include "wiMath.h" +#include "wiLensFlare.h" +#include "wiSound.h" +#include "wiResourceManager.h" +#include "wiTimer.h" +#include "wiHelper.h" +#include "wiInputManager.h" +#include "wiCvar.h" +#include "wiTextureHelper.h" #include "wiRandom.h" #include "wiColor.h" @@ -41,6 +41,11 @@ #include "DeferredRenderableComponent.h" +#include "Utility/WicTextureLoader.h" +#include "Utility/DDSTextureLoader.h" +#include "Utility/ScreenGrab.h" + + #ifndef WINSTORE_SUPPORT diff --git a/WickedEngine/WickedEngine.vcxproj b/WickedEngine/WickedEngine.vcxproj index b9b6798e8..186041985 100644 --- a/WickedEngine/WickedEngine.vcxproj +++ b/WickedEngine/WickedEngine.vcxproj @@ -173,8 +173,8 @@ - - + + @@ -320,52 +320,52 @@ - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + - - + + @@ -579,43 +579,43 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -623,13 +623,13 @@ - - - - + + + + - + diff --git a/WickedEngine/WickedEngine.vcxproj.filters b/WickedEngine/WickedEngine.vcxproj.filters index a143fe539..d663890b9 100644 --- a/WickedEngine/WickedEngine.vcxproj.filters +++ b/WickedEngine/WickedEngine.vcxproj.filters @@ -53,102 +53,6 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - Utility @@ -581,9 +485,6 @@ BULLET\BulletDynamics - - Source Files - ComponentTemplates @@ -596,125 +497,122 @@ ComponentTemplates - - Source Files - Source Files Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + - - Header Files - Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - Utility @@ -733,9 +631,6 @@ Utility - - Header Files - BULLET\BulletCollision @@ -1375,12 +1270,6 @@ BULLET - - Header Files - - - Header Files - ComponentTemplates @@ -1396,15 +1285,126 @@ ComponentTemplates - - Header Files - Header Files Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/WickedEngine/XInput.cpp b/WickedEngine/XInput.cpp index bfada6a4e..ebff7ef9b 100644 --- a/WickedEngine/XInput.cpp +++ b/WickedEngine/XInput.cpp @@ -1,4 +1,4 @@ -#include "XInput.h" +#include "wiXInput.h" XInput::XInput(void) diff --git a/WickedEngine/BULLET.cpp b/WickedEngine/wiBULLET.cpp similarity index 99% rename from WickedEngine/BULLET.cpp rename to WickedEngine/wiBULLET.cpp index de06b4446..d9010014e 100644 --- a/WickedEngine/BULLET.cpp +++ b/WickedEngine/wiBULLET.cpp @@ -1,5 +1,5 @@ -#include "BULLET.h" -#include "WickedLoader.h" +#include "wiBULLET.h" +#include "wiLoader.h" int PHYSICS::softBodyInterationCount=5; bool BULLET::grab=false; diff --git a/WickedEngine/BULLET.h b/WickedEngine/wiBULLET.h similarity index 99% rename from WickedEngine/BULLET.h rename to WickedEngine/wiBULLET.h index 7d8a3e061..cf3f28d4b 100644 --- a/WickedEngine/BULLET.h +++ b/WickedEngine/wiBULLET.h @@ -1,5 +1,5 @@ #pragma once -#include "PHYSICS.h" +#include "wiPHYSICS.h" #include "btBulletDynamicsCommon.h" #include "LinearMath/btHashMap.h" diff --git a/WickedEngine/BackLog.cpp b/WickedEngine/wiBackLog.cpp similarity index 96% rename from WickedEngine/BackLog.cpp rename to WickedEngine/wiBackLog.cpp index 32255a48e..e03da4c48 100644 --- a/WickedEngine/BackLog.cpp +++ b/WickedEngine/wiBackLog.cpp @@ -1,8 +1,8 @@ -#include "BackLog.h" -#include "WickedMath.h" -#include "ResourceManager.h" -#include "ImageEffects.h" -#include "Renderer.h" +#include "wiBackLog.h" +#include "wiMath.h" +#include "wiResourceManager.h" +#include "wiImageEffects.h" +#include "wiRenderer.h" deque wiBackLog::stream; deque wiBackLog::history; diff --git a/WickedEngine/BackLog.h b/WickedEngine/wiBackLog.h similarity index 95% rename from WickedEngine/BackLog.h rename to WickedEngine/wiBackLog.h index 44b1012a4..166a47664 100644 --- a/WickedEngine/BackLog.h +++ b/WickedEngine/wiBackLog.h @@ -1,8 +1,8 @@ #ifndef BACKLOG #define BACKLOG #include "CommonInclude.h" -#include "Font.h" -#include "Image.h" +#include "wiFont.h" +#include "wiImage.h" static class wiBackLog { diff --git a/WickedEngine/Camera.cpp b/WickedEngine/wiCamera.cpp similarity index 99% rename from WickedEngine/Camera.cpp rename to WickedEngine/wiCamera.cpp index 544589bd8..250f78691 100644 --- a/WickedEngine/Camera.cpp +++ b/WickedEngine/wiCamera.cpp @@ -1,4 +1,4 @@ -#include "Camera.h" +#include "wiCamera.h" diff --git a/WickedEngine/Camera.h b/WickedEngine/wiCamera.h similarity index 100% rename from WickedEngine/Camera.h rename to WickedEngine/wiCamera.h diff --git a/WickedEngine/Client.cpp b/WickedEngine/wiClient.cpp similarity index 98% rename from WickedEngine/Client.cpp rename to WickedEngine/wiClient.cpp index eff353f32..caa4b4c63 100644 --- a/WickedEngine/Client.cpp +++ b/WickedEngine/wiClient.cpp @@ -1,4 +1,4 @@ -#include "Client.h" +#include "wiClient.h" #ifndef WINSTORE_SUPPORT diff --git a/WickedEngine/Client.h b/WickedEngine/wiClient.h similarity index 98% rename from WickedEngine/Client.h rename to WickedEngine/wiClient.h index 03d948bd0..cb82a7e82 100644 --- a/WickedEngine/Client.h +++ b/WickedEngine/wiClient.h @@ -1,7 +1,7 @@ #ifndef CLIENT_H #define CLIENT_H -#include "Network.h" +#include "wiNetwork.h" #ifndef WINSTORE_SUPPORT diff --git a/WickedEngine/CpuInfo.cpp b/WickedEngine/wiCpuInfo.cpp similarity index 98% rename from WickedEngine/CpuInfo.cpp rename to WickedEngine/wiCpuInfo.cpp index 9e794eef8..d8b80fce8 100644 --- a/WickedEngine/CpuInfo.cpp +++ b/WickedEngine/wiCpuInfo.cpp @@ -1,4 +1,4 @@ -#include "CpuInfo.h" +#include "wiCpuInfo.h" #ifndef WINSTORE_SUPPORT diff --git a/WickedEngine/CpuInfo.h b/WickedEngine/wiCpuInfo.h similarity index 100% rename from WickedEngine/CpuInfo.h rename to WickedEngine/wiCpuInfo.h diff --git a/WickedEngine/Cube.cpp b/WickedEngine/wiCube.cpp similarity index 97% rename from WickedEngine/Cube.cpp rename to WickedEngine/wiCube.cpp index 518f369a1..1b25049fb 100644 --- a/WickedEngine/Cube.cpp +++ b/WickedEngine/wiCube.cpp @@ -1,5 +1,5 @@ -#include "Cube.h" -#include "Renderer.h" +#include "wiCube.h" +#include "wiRenderer.h" ID3D11Buffer* Cube::vertexBuffer; ID3D11Buffer* Cube::indexBuffer; diff --git a/WickedEngine/Cube.h b/WickedEngine/wiCube.h similarity index 87% rename from WickedEngine/Cube.h rename to WickedEngine/wiCube.h index d1a95921e..27cb13f5f 100644 --- a/WickedEngine/Cube.h +++ b/WickedEngine/wiCube.h @@ -28,6 +28,15 @@ private: Vertex(){ pos=XMFLOAT3A(0,0,0); } Vertex(const XMFLOAT3A& newPos){ pos=newPos; } + + void* operator new(size_t size) + { + return _aligned_malloc(size, 16); + } + void operator delete(void* p) + { + if (p) _aligned_free(p); + } }; static void SetUpVertices(); public: diff --git a/WickedEngine/VariableManager.cpp b/WickedEngine/wiCvar.cpp similarity index 96% rename from WickedEngine/VariableManager.cpp rename to WickedEngine/wiCvar.cpp index 78bb02ec2..9c4769ac7 100644 --- a/WickedEngine/VariableManager.cpp +++ b/WickedEngine/wiCvar.cpp @@ -1,4 +1,4 @@ -#include "VariableManager.h" +#include "wiCvar.h" VariableManager::container VariableManager::variables; diff --git a/WickedEngine/VariableManager.h b/WickedEngine/wiCvar.h similarity index 100% rename from WickedEngine/VariableManager.h rename to WickedEngine/wiCvar.h diff --git a/WickedEngine/DepthTarget.cpp b/WickedEngine/wiDepthTarget.cpp similarity index 98% rename from WickedEngine/DepthTarget.cpp rename to WickedEngine/wiDepthTarget.cpp index 9484da70d..f51b259ba 100644 --- a/WickedEngine/DepthTarget.cpp +++ b/WickedEngine/wiDepthTarget.cpp @@ -1,5 +1,5 @@ -#include "DepthTarget.h" -#include "Renderer.h" +#include "wiDepthTarget.h" +#include "wiRenderer.h" wiDepthTarget::wiDepthTarget() diff --git a/WickedEngine/DepthTarget.h b/WickedEngine/wiDepthTarget.h similarity index 100% rename from WickedEngine/DepthTarget.h rename to WickedEngine/wiDepthTarget.h diff --git a/WickedEngine/wiDirectInput.cpp b/WickedEngine/wiDirectInput.cpp new file mode 100644 index 000000000..785a4fada --- /dev/null +++ b/WickedEngine/wiDirectInput.cpp @@ -0,0 +1,287 @@ +#include "wiDirectInput.h" + +#ifndef WINSTORE_SUPPORT + +DirectInput::DirectInput(HINSTANCE hinstance, HWND hwnd) +{ + for(int i=0;i<256;++i){ + m_keyboardState[i]=0; + } + Initialize(hinstance, hwnd); +} + + +IDirectInputDevice8* m_keyboard = 0; +IDirectInputDevice8* joystick[2] = {0,0}; +IDirectInput8* m_directInput = 0; + short DirectInput::connectedJoys=0; + +BOOL CALLBACK enumCallback(const DIDEVICEINSTANCE* instance, VOID* context) +{ + HRESULT hr; + + // Obtain an interface to the enumerated joystick. + hr = m_directInput->CreateDevice(instance->guidInstance, &joystick[DirectInput::connectedJoys], NULL); + + // If it failed, then we can't use this joystick. (Maybe the user unplugged + // it while we were in the middle of enumerating it.) + if (FAILED(hr)) { + return DIENUM_CONTINUE; + } + + // Stop enumeration. Note: we're just taking the first joystick we get. You + // could store all the enumerated joysticks and let the user pick. + DirectInput::connectedJoys++; + if(DirectInput::connectedJoys<2) + return DIENUM_CONTINUE; + else + return DIENUM_STOP; +} +BOOL CALLBACK enumAxesCallback(const DIDEVICEOBJECTINSTANCE* instance, VOID* context) +{ + HWND hDlg = (HWND)context; + + DIPROPRANGE propRange; + propRange.diph.dwSize = sizeof(DIPROPRANGE); + propRange.diph.dwHeaderSize = sizeof(DIPROPHEADER); + propRange.diph.dwHow = DIPH_BYID; + propRange.diph.dwObj = instance->dwType; + propRange.lMin = -1000; + propRange.lMax = +1000; + + // Set the range for the axis + for(short i=0;iSetProperty(DIPROP_RANGE, &propRange.diph))) { + return DIENUM_STOP; + } + + return DIENUM_CONTINUE; +} + + +HRESULT DirectInput::Initialize(HINSTANCE hinstance, HWND hwnd) +{ + HRESULT result; + + + // Initialize the main direct input interface. + result = DirectInput8Create(hinstance, DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&m_directInput, NULL); + if(FAILED(result)) + { + return E_FAIL; + } + + // Initialize the direct input interface for the keyboard. + result = m_directInput->CreateDevice(GUID_SysKeyboard, &m_keyboard, NULL); + if(FAILED(result)) + { + return E_FAIL; + } + + // Set the data format. In this case since it is a keyboard we can use the predefined data format. + result = m_keyboard->SetDataFormat(&c_dfDIKeyboard); + if(FAILED(result)) + { + return E_FAIL; + } + + // Set the cooperative level of the keyboard to not share with other programs. + result = m_keyboard->SetCooperativeLevel(hwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE); + if(FAILED(result)) + { + return E_FAIL; + } + + // Now acquire the keyboard. + result = m_keyboard->Acquire(); + if(FAILED(result)) + { + return E_FAIL; + } + m_keyboard->GetDeviceState(sizeof(m_keyboardState), (LPVOID)&m_keyboardState); + + InitJoy(hwnd); + + return S_OK; +} +HRESULT DirectInput::InitJoy(HWND hwnd){ + HRESULT result; + // Look for the first simple joystick we can find. + if (FAILED(result = m_directInput->EnumDevices(DI8DEVCLASS_GAMECTRL, ::enumCallback, NULL, DIEDFL_ATTACHEDONLY))) { + return result; + } + for(short i=0;iSetDataFormat(&c_dfDIJoystick2))) { + return result; + } + + // Set the cooperative level to let DInput know how this device should + // interact with the system and with other DInput applications. + if (FAILED(result = joystick[i]->SetCooperativeLevel(hwnd, DISCL_EXCLUSIVE | DISCL_FOREGROUND))) { + return result; + } + + // Determine how many axis the joystick has (so we don't error out setting + // properties for unavailable axis) + capabilities.dwSize = sizeof(DIDEVCAPS); + if (FAILED(result = joystick[i]->GetCapabilities(&capabilities))) { + return result; + } + + // Enumerate the axes of the joyctick and set the range of each axis. Note: + // we could just use the defaults, but we're just trying to show an example + // of enumerating device objects (axes, buttons, etc.). + if (FAILED(result = joystick[i]->EnumObjects(::enumAxesCallback, NULL, DIDFT_AXIS))) + return result; + } + + + + return S_OK; +} + +void DirectInput::Shutdown() +{ + // Release the keyboard. + if(m_keyboard) + { + m_keyboard->Unacquire(); + m_keyboard->Release(); + m_keyboard = 0; + } + // Release Joypad + if(joystick){ + for(short i=0;iUnacquire(); + joystick[i]->Release(); + joystick[i] = 0; + } + } + // Release the main interface to direct input. + if(m_directInput) + { + m_directInput->Release(); + m_directInput = 0; + } + + + return; +} + +bool DirectInput::Frame() +{ + if(m_keyboard==nullptr) + return false; + // Read the keyboard device. + HRESULT result = m_keyboard->GetDeviceState(sizeof(m_keyboardState), (LPVOID)&m_keyboardState); + if(FAILED(result)) + { + // If the keyboard lost focus or was not acquired then try to get control back. + if((result == DIERR_INPUTLOST) || (result == DIERR_NOTACQUIRED)) + { + m_keyboard->Acquire(); + } + else + { + return false; + } + } + for(short i=0;iPoll(); + if (FAILED(hr)) { + // DInput is telling us that the input stream has been + // interrupted. We aren't tracking any state between polls, so + // we don't have any special reset that needs to be done. We + // just re-acquire and try again. + hr = joy->Acquire(); + while (hr == DIERR_INPUTLOST) { + hr = joy->Acquire(); + } + + // If we encounter a fatal error, return failure. + if ((hr == DIERR_INVALIDPARAM) || (hr == DIERR_NOTINITIALIZED)) { + return E_FAIL; + } + + // If another application has control of this device, return successfully. + // We'll just have to wait our turn to use the joystick. + if (hr == DIERR_OTHERAPPHASPRIO) { + return S_OK; + } + } + + // Get the input's device state + if (FAILED(hr = joy->GetDeviceState(sizeof(DIJOYSTATE2), js))) { + return hr; // The device should have been acquired during the Poll() + } + + return S_OK; +} + +bool DirectInput::isButtonDown(short pIndex, unsigned int buttoncode) +{ + if(connectedJoys) + if(joyState[pIndex].rgbButtons[buttoncode-1]!=0) + return true; + return false; +} +DWORD DirectInput::getDirections(short pIndex) +{ + DWORD buttons=0; + if(connectedJoys) + for(short i=0;i<4;i++){ + //if((LOWORD(joyState[pIndex].rgdwPOV[i]) != 0xFFFF)) + if(buttons+=joyState[pIndex].rgdwPOV[i]!=POV_IDLE) + buttons+=joyState[pIndex].rgdwPOV[i]; + } + return buttons; +} + +#endif diff --git a/WickedEngine/DirectInput.h b/WickedEngine/wiDirectInput.h similarity index 100% rename from WickedEngine/DirectInput.h rename to WickedEngine/wiDirectInput.h diff --git a/WickedEngine/EmittedParticle.cpp b/WickedEngine/wiEmittedParticle.cpp similarity index 99% rename from WickedEngine/EmittedParticle.cpp rename to WickedEngine/wiEmittedParticle.cpp index c93dc353b..42f08a930 100644 --- a/WickedEngine/EmittedParticle.cpp +++ b/WickedEngine/wiEmittedParticle.cpp @@ -1,10 +1,10 @@ -#include "EmittedParticle.h" -#include "WickedMath.h" -#include "WickedLoader.h" -#include "Renderer.h" -#include "ResourceManager.h" -#include "Frustum.h" -#include "Camera.h" +#include "wiEmittedParticle.h" +#include "wiMath.h" +#include "wiLoader.h" +#include "wiRenderer.h" +#include "wiResourceManager.h" +#include "wiFrustum.h" +#include "wiCamera.h" //ID3D11Buffer *wiEmittedParticle::vertexBuffer; ID3D11InputLayout *wiEmittedParticle::vertexLayout; diff --git a/WickedEngine/EmittedParticle.h b/WickedEngine/wiEmittedParticle.h similarity index 99% rename from WickedEngine/EmittedParticle.h rename to WickedEngine/wiEmittedParticle.h index ef74d15e5..fe60a1b57 100644 --- a/WickedEngine/EmittedParticle.h +++ b/WickedEngine/wiEmittedParticle.h @@ -1,5 +1,5 @@ #pragma once -#include "Particle.h" +#include "wiParticle.h" struct Material; struct AABB; diff --git a/WickedEngine/Font.cpp b/WickedEngine/wiFont.cpp similarity index 99% rename from WickedEngine/Font.cpp rename to WickedEngine/wiFont.cpp index 8b405a3b7..78b0002a8 100644 --- a/WickedEngine/Font.cpp +++ b/WickedEngine/wiFont.cpp @@ -1,8 +1,8 @@ -#include "Font.h" -#include "Renderer.h" -#include "ResourceManager.h" -#include "WickedHelper.h" -#include "Camera.h" +#include "wiFont.h" +#include "wiRenderer.h" +#include "wiResourceManager.h" +#include "wiHelper.h" +#include "wiCamera.h" ID3D11Buffer *wiFont::vertexBuffer,*wiFont::indexBuffer; diff --git a/WickedEngine/Font.h b/WickedEngine/wiFont.h similarity index 100% rename from WickedEngine/Font.h rename to WickedEngine/wiFont.h diff --git a/WickedEngine/FrameRate.cpp b/WickedEngine/wiFrameRate.cpp similarity index 95% rename from WickedEngine/FrameRate.cpp rename to WickedEngine/wiFrameRate.cpp index ff44f0e8a..d52e8f04a 100644 --- a/WickedEngine/FrameRate.cpp +++ b/WickedEngine/wiFrameRate.cpp @@ -1,4 +1,4 @@ -#include "FrameRate.h" +#include "wiFrameRate.h" Timer wiFrameRate::timer; double wiFrameRate::dt=0.0; diff --git a/WickedEngine/FrameRate.h b/WickedEngine/wiFrameRate.h similarity index 91% rename from WickedEngine/FrameRate.h rename to WickedEngine/wiFrameRate.h index 78010ed4c..70b699775 100644 --- a/WickedEngine/FrameRate.h +++ b/WickedEngine/wiFrameRate.h @@ -1,6 +1,6 @@ #pragma once #include "CommonInclude.h" -#include "Timer.h" +#include "wiTimer.h" class Timer; diff --git a/WickedEngine/Frustum.cpp b/WickedEngine/wiFrustum.cpp similarity index 99% rename from WickedEngine/Frustum.cpp rename to WickedEngine/wiFrustum.cpp index 908912701..21ac08439 100644 --- a/WickedEngine/Frustum.cpp +++ b/WickedEngine/wiFrustum.cpp @@ -1,4 +1,4 @@ -#include "Frustum.h" +#include "wiFrustum.h" Frustum::Frustum() diff --git a/WickedEngine/Frustum.h b/WickedEngine/wiFrustum.h similarity index 100% rename from WickedEngine/Frustum.h rename to WickedEngine/wiFrustum.h diff --git a/WickedEngine/HairParticle.cpp b/WickedEngine/wiHairParticle.cpp similarity index 99% rename from WickedEngine/HairParticle.cpp rename to WickedEngine/wiHairParticle.cpp index 71082ab59..e374b8bb3 100644 --- a/WickedEngine/HairParticle.cpp +++ b/WickedEngine/wiHairParticle.cpp @@ -1,9 +1,9 @@ -#include "HairParticle.h" -#include "Renderer.h" -#include "ResourceManager.h" -#include "WickedLoader.h" -#include "WickedMath.h" -#include "Frustum.h" +#include "wiHairParticle.h" +#include "wiRenderer.h" +#include "wiResourceManager.h" +#include "wiLoader.h" +#include "wiMath.h" +#include "wiFrustum.h" ID3D11InputLayout* wiHairParticle::il; ID3D11VertexShader* wiHairParticle::vs; diff --git a/WickedEngine/HairParticle.h b/WickedEngine/wiHairParticle.h similarity index 98% rename from WickedEngine/HairParticle.h rename to WickedEngine/wiHairParticle.h index 8d5f34873..2d53ff365 100644 --- a/WickedEngine/HairParticle.h +++ b/WickedEngine/wiHairParticle.h @@ -1,5 +1,5 @@ #pragma once -#include "Particle.h" +#include "wiParticle.h" class wiSPTree; struct Material; diff --git a/WickedEngine/WickedHelper.cpp b/WickedEngine/wiHelper.cpp similarity index 97% rename from WickedEngine/WickedHelper.cpp rename to WickedEngine/wiHelper.cpp index b2c06c170..b09dc7473 100644 --- a/WickedEngine/WickedHelper.cpp +++ b/WickedEngine/wiHelper.cpp @@ -1,4 +1,4 @@ -#include "WickedHelper.h" +#include "wiHelper.h" namespace wiHelper { diff --git a/WickedEngine/WickedHelper.h b/WickedEngine/wiHelper.h similarity index 100% rename from WickedEngine/WickedHelper.h rename to WickedEngine/wiHelper.h diff --git a/WickedEngine/Hitbox2D.cpp b/WickedEngine/wiHitbox2D.cpp similarity index 92% rename from WickedEngine/Hitbox2D.cpp rename to WickedEngine/wiHitbox2D.cpp index 4e30199fd..925bf00ec 100644 --- a/WickedEngine/Hitbox2D.cpp +++ b/WickedEngine/wiHitbox2D.cpp @@ -1,5 +1,5 @@ #include "CommonInclude.h" -#include "Hitbox2D.h" +#include "wiHitbox2D.h" bool Hitbox2D::intersects(const Hitbox2D& b) diff --git a/WickedEngine/Hitbox2D.h b/WickedEngine/wiHitbox2D.h similarity index 100% rename from WickedEngine/Hitbox2D.h rename to WickedEngine/wiHitbox2D.h diff --git a/WickedEngine/Image.cpp b/WickedEngine/wiImage.cpp similarity index 99% rename from WickedEngine/Image.cpp rename to WickedEngine/wiImage.cpp index 77a7ad791..262a96da5 100644 --- a/WickedEngine/Image.cpp +++ b/WickedEngine/wiImage.cpp @@ -1,10 +1,10 @@ -#include "Image.h" -#include "ResourceManager.h" -#include "Renderer.h" -#include "ImageEffects.h" -#include "WickedLoader.h" -#include "Camera.h" -#include "WickedHelper.h" +#include "wiImage.h" +#include "wiResourceManager.h" +#include "wiRenderer.h" +#include "wiImageEffects.h" +#include "wiLoader.h" +#include "wiCamera.h" +#include "wiHelper.h" #pragma region STATICS mutex wiImage::MUTEX; diff --git a/WickedEngine/Image.h b/WickedEngine/wiImage.h similarity index 97% rename from WickedEngine/Image.h rename to WickedEngine/wiImage.h index 652ef9c04..0bb93f80a 100644 --- a/WickedEngine/Image.h +++ b/WickedEngine/wiImage.h @@ -70,7 +70,7 @@ public: wiImage(); static void Draw(ID3D11ShaderResourceView* texture, const wiImageEffects& effects); - inline static void Draw(ID3D11ShaderResourceView* texture, const wiImageEffects& effects,ID3D11DeviceContext* context); + static void Draw(ID3D11ShaderResourceView* texture, const wiImageEffects& effects,ID3D11DeviceContext* context); static void DrawDeferred(ID3D11ShaderResourceView* texture , ID3D11ShaderResourceView* depth, ID3D11ShaderResourceView* lightmap, ID3D11ShaderResourceView* normal diff --git a/WickedEngine/ImageEffects.h b/WickedEngine/wiImageEffects.h similarity index 100% rename from WickedEngine/ImageEffects.h rename to WickedEngine/wiImageEffects.h diff --git a/WickedEngine/InputManager.cpp b/WickedEngine/wiInputManager.cpp similarity index 97% rename from WickedEngine/InputManager.cpp rename to WickedEngine/wiInputManager.cpp index 6a3bf8e3c..47dba9dd5 100644 --- a/WickedEngine/InputManager.cpp +++ b/WickedEngine/wiInputManager.cpp @@ -1,6 +1,6 @@ -#include "InputManager.h" -#include "XInput.h" -#include "DirectInput.h" +#include "wiInputManager.h" +#include "wiXInput.h" +#include "wiDirectInput.h" XInput* wiInputManager::xinput=nullptr; DirectInput* wiInputManager::dinput=nullptr; diff --git a/WickedEngine/InputManager.h b/WickedEngine/wiInputManager.h similarity index 100% rename from WickedEngine/InputManager.h rename to WickedEngine/wiInputManager.h diff --git a/WickedEngine/LensFlare.cpp b/WickedEngine/wiLensFlare.cpp similarity index 99% rename from WickedEngine/LensFlare.cpp rename to WickedEngine/wiLensFlare.cpp index e98502a4f..42aaddcf0 100644 --- a/WickedEngine/LensFlare.cpp +++ b/WickedEngine/wiLensFlare.cpp @@ -1,6 +1,6 @@ -#include "LensFlare.h" -#include "Renderer.h" -#include "ResourceManager.h" +#include "wiLensFlare.h" +#include "wiRenderer.h" +#include "wiResourceManager.h" ID3D11Buffer* wiLensFlare::constantBuffer; diff --git a/WickedEngine/LensFlare.h b/WickedEngine/wiLensFlare.h similarity index 100% rename from WickedEngine/LensFlare.h rename to WickedEngine/wiLensFlare.h diff --git a/WickedEngine/Lines.cpp b/WickedEngine/wiLines.cpp similarity index 97% rename from WickedEngine/Lines.cpp rename to WickedEngine/wiLines.cpp index f1c16437c..53b300306 100644 --- a/WickedEngine/Lines.cpp +++ b/WickedEngine/wiLines.cpp @@ -1,5 +1,5 @@ -#include "Lines.h" -#include "Renderer.h" +#include "wiLines.h" +#include "wiRenderer.h" Lines::Lines() { diff --git a/WickedEngine/Lines.h b/WickedEngine/wiLines.h similarity index 100% rename from WickedEngine/Lines.h rename to WickedEngine/wiLines.h diff --git a/WickedEngine/WickedLoader.cpp b/WickedEngine/wiLoader.cpp similarity index 99% rename from WickedEngine/WickedLoader.cpp rename to WickedEngine/wiLoader.cpp index 834118a53..586b0213c 100644 --- a/WickedEngine/WickedLoader.cpp +++ b/WickedEngine/wiLoader.cpp @@ -1,12 +1,12 @@ -#include "WickedLoader.h" -#include "ResourceManager.h" -#include "WickedHelper.h" -#include "WickedMath.h" -#include "Renderer.h" -#include "EmittedParticle.h" -#include "HairParticle.h" -#include "RenderTarget.h" -#include "DepthTarget.h" +#include "wiLoader.h" +#include "wiResourceManager.h" +#include "wiHelper.h" +#include "wiMath.h" +#include "wiRenderer.h" +#include "wiEmittedParticle.h" +#include "wiHairParticle.h" +#include "wiRenderTarget.h" +#include "wiDepthTarget.h" void Mesh::LoadFromFile(const string& newName, const string& fname diff --git a/WickedEngine/WickedLoader.h b/WickedEngine/wiLoader.h similarity index 99% rename from WickedEngine/WickedLoader.h rename to WickedEngine/wiLoader.h index 9c0842907..389a740f6 100644 --- a/WickedEngine/WickedLoader.h +++ b/WickedEngine/wiLoader.h @@ -1,9 +1,9 @@ #pragma once #include "CommonInclude.h" #include "skinningDEF.h" -#include "ImageEffects.h" -#include "RenderTarget.h" -#include "DepthTarget.h" +#include "wiImageEffects.h" +#include "wiRenderTarget.h" +#include "wiDepthTarget.h" class HitSphere; class wiParticle; @@ -883,7 +883,7 @@ void LoadFromDisk(const string& dir, const string& name, const string& identifie -#include "SPTree.h" +#include "wiSPTree.h" class wiSPTree; #define GENERATE_QUADTREE 0 #define GENERATE_OCTREE 1 diff --git a/WickedEngine/WickedMath.cpp b/WickedEngine/wiMath.cpp similarity index 99% rename from WickedEngine/WickedMath.cpp rename to WickedEngine/wiMath.cpp index 829b8cb86..29b4a2b9e 100644 --- a/WickedEngine/WickedMath.cpp +++ b/WickedEngine/wiMath.cpp @@ -1,4 +1,4 @@ -#include "WickedMath.h" +#include "wiMath.h" namespace wiMath { diff --git a/WickedEngine/WickedMath.h b/WickedEngine/wiMath.h similarity index 100% rename from WickedEngine/WickedMath.h rename to WickedEngine/wiMath.h diff --git a/WickedEngine/Network.cpp b/WickedEngine/wiNetwork.cpp similarity index 98% rename from WickedEngine/Network.cpp rename to WickedEngine/wiNetwork.cpp index adbccd3c3..ba58c7103 100644 --- a/WickedEngine/Network.cpp +++ b/WickedEngine/wiNetwork.cpp @@ -1,4 +1,4 @@ -#include "Network.h" +#include "wiNetwork.h" #ifndef WINSTORE_SUPPORT diff --git a/WickedEngine/Network.h b/WickedEngine/wiNetwork.h similarity index 98% rename from WickedEngine/Network.h rename to WickedEngine/wiNetwork.h index 2e0e9f8e9..341716ddd 100644 --- a/WickedEngine/Network.h +++ b/WickedEngine/wiNetwork.h @@ -1,7 +1,7 @@ #ifndef NETWORK_H #define NETWORK_H -#include "BackLog.h" +#include "wiBackLog.h" #include #include diff --git a/WickedEngine/PHYSICS.h b/WickedEngine/wiPHYSICS.h similarity index 99% rename from WickedEngine/PHYSICS.h rename to WickedEngine/wiPHYSICS.h index effc16586..065fea0c6 100644 --- a/WickedEngine/PHYSICS.h +++ b/WickedEngine/wiPHYSICS.h @@ -64,4 +64,4 @@ public: virtual void registerObject(Object* object)=0; }; //#include "HAVOK.h" -#include "BULLET.h" \ No newline at end of file +#include "wiBULLET.h" \ No newline at end of file diff --git a/WickedEngine/Particle.cpp b/WickedEngine/wiParticle.cpp similarity index 61% rename from WickedEngine/Particle.cpp rename to WickedEngine/wiParticle.cpp index b1b52fc98..1d136885e 100644 --- a/WickedEngine/Particle.cpp +++ b/WickedEngine/wiParticle.cpp @@ -1,4 +1,4 @@ -#include "Particle.h" +#include "wiParticle.h" diff --git a/WickedEngine/Particle.h b/WickedEngine/wiParticle.h similarity index 81% rename from WickedEngine/Particle.h rename to WickedEngine/wiParticle.h index 60fb127bf..47ccc23be 100644 --- a/WickedEngine/Particle.h +++ b/WickedEngine/wiParticle.h @@ -18,6 +18,6 @@ public: static void ChangeRasterizer(){wireRender=!wireRender;} }; -#include "EmittedParticle.h" -#include "HairParticle.h" +#include "wiEmittedParticle.h" +#include "wiHairParticle.h" diff --git a/WickedEngine/RenderTarget.cpp b/WickedEngine/wiRenderTarget.cpp similarity index 98% rename from WickedEngine/RenderTarget.cpp rename to WickedEngine/wiRenderTarget.cpp index cb2f4ad17..9744b0473 100644 --- a/WickedEngine/RenderTarget.cpp +++ b/WickedEngine/wiRenderTarget.cpp @@ -1,6 +1,6 @@ -#include "RenderTarget.h" -#include "Renderer.h" -#include "DepthTarget.h" +#include "wiRenderTarget.h" +#include "wiRenderer.h" +#include "wiDepthTarget.h" void wiRenderTarget::clear(){ diff --git a/WickedEngine/RenderTarget.h b/WickedEngine/wiRenderTarget.h similarity index 100% rename from WickedEngine/RenderTarget.h rename to WickedEngine/wiRenderTarget.h diff --git a/WickedEngine/Renderer.cpp b/WickedEngine/wiRenderer.cpp similarity index 99% rename from WickedEngine/Renderer.cpp rename to WickedEngine/wiRenderer.cpp index 61024998e..666cf8f41 100644 --- a/WickedEngine/Renderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -1,19 +1,19 @@ -#include "Renderer.h" +#include "wiRenderer.h" #include "skinningDEF.h" -#include "FrameRate.h" -#include "HairParticle.h" -#include "EmittedParticle.h" -#include "Camera.h" -#include "ResourceManager.h" -#include "Sprite.h" -#include "WickedLoader.h" -#include "Frustum.h" -#include "RenderTarget.h" -#include "DepthTarget.h" -#include "WickedHelper.h" -#include "WickedMath.h" -#include "LensFlare.h" -#include "TextureHelper.h" +#include "wiFrameRate.h" +#include "wiHairParticle.h" +#include "wiEmittedParticle.h" +#include "wiCamera.h" +#include "wiResourceManager.h" +#include "wiSprite.h" +#include "wiLoader.h" +#include "wiFrustum.h" +#include "wiRenderTarget.h" +#include "wiDepthTarget.h" +#include "wiHelper.h" +#include "wiMath.h" +#include "wiLensFlare.h" +#include "wiTextureHelper.h" #pragma region STATICS D3D_DRIVER_TYPE wiRenderer::driverType; diff --git a/WickedEngine/Renderer.h b/WickedEngine/wiRenderer.h similarity index 99% rename from WickedEngine/Renderer.h rename to WickedEngine/wiRenderer.h index 2a47a5e37..04c92a69c 100644 --- a/WickedEngine/Renderer.h +++ b/WickedEngine/wiRenderer.h @@ -1,8 +1,8 @@ #pragma once #include "CommonInclude.h" -#include "PHYSICS.h" -#include "Lines.h" -#include "Cube.h" +#include "wiPHYSICS.h" +#include "wiLines.h" +#include "wiCube.h" struct Transform; struct Vertex; @@ -300,7 +300,7 @@ protected: static void RecursiveBoneTransform(Armature* armature, Bone* bone, const XMMATRIX& parentCombinedMat); - inline static XMVECTOR InterPolateKeyFrames(const float& currentFrame, const int& frameCount,const std::vector& keyframes, KeyFrameType type); + static XMVECTOR InterPolateKeyFrames(const float& currentFrame, const int& frameCount,const std::vector& keyframes, KeyFrameType type); static Vertex TransformVertex(const Mesh* mesh, const int& vertexI, const XMMATRIX& mat=XMMatrixIdentity()); XMFLOAT3 VertexVelocity(const Mesh* mesh, const int& vertexI); @@ -989,8 +989,8 @@ public: static void DrawLensFlares(ID3D11DeviceContext* context, ID3D11ShaderResourceView* depth, const int& RENDERWIDTH, const int& RENDERHEIGHT); static void DrawDecals(const XMMATRIX& newView, DeviceContext context, TextureView depth); - inline static XMVECTOR GetSunPosition(); - inline static XMFLOAT4 GetSunColor(); + static XMVECTOR GetSunPosition(); + static XMFLOAT4 GetSunColor(); static Wind wind; static int getVertexCount(){return vertexCount;} static void resetVertexCount(){vertexCount=0;} diff --git a/WickedEngine/ResourceManager.cpp b/WickedEngine/wiResourceManager.cpp similarity index 97% rename from WickedEngine/ResourceManager.cpp rename to WickedEngine/wiResourceManager.cpp index 2aa33f944..98f203a79 100644 --- a/WickedEngine/ResourceManager.cpp +++ b/WickedEngine/wiResourceManager.cpp @@ -1,7 +1,9 @@ -#include "ResourceManager.h" -#include "Renderer.h" -#include "Sound.h" -#include "WickedHelper.h" +#include "wiResourceManager.h" +#include "wiRenderer.h" +#include "wiSound.h" +#include "wiHelper.h" +#include "Utility/WicTextureLoader.h" +#include "Utility/DDSTextureLoader.h" wiResourceManager::container wiResourceManager::resources; diff --git a/WickedEngine/ResourceManager.h b/WickedEngine/wiResourceManager.h similarity index 100% rename from WickedEngine/ResourceManager.h rename to WickedEngine/wiResourceManager.h diff --git a/WickedEngine/SPTree.cpp b/WickedEngine/wiSPTree.cpp similarity index 98% rename from WickedEngine/SPTree.cpp rename to WickedEngine/wiSPTree.cpp index 16292b8d5..652733d04 100644 --- a/WickedEngine/SPTree.cpp +++ b/WickedEngine/wiSPTree.cpp @@ -1,7 +1,7 @@ -#include "SPTree.h" -#include "WickedMath.h" -#include "WickedLoader.h" -#include "Frustum.h" +#include "wiSPTree.h" +#include "wiMath.h" +#include "wiLoader.h" +#include "wiFrustum.h" #define SP_TREE_MAX_DEPTH 100 #define SP_TREE_OBJECT_PER_NODE 6 diff --git a/WickedEngine/SPTree.h b/WickedEngine/wiSPTree.h similarity index 98% rename from WickedEngine/SPTree.h rename to WickedEngine/wiSPTree.h index 3778e0ade..aa51feb7e 100644 --- a/WickedEngine/SPTree.h +++ b/WickedEngine/wiSPTree.h @@ -1,6 +1,6 @@ #pragma once #include "CommonInclude.h" -#include "WickedLoader.h" +#include "wiLoader.h" class Frustum; // diff --git a/WickedEngine/Server.cpp b/WickedEngine/wiServer.cpp similarity index 99% rename from WickedEngine/Server.cpp rename to WickedEngine/wiServer.cpp index 2ef5641d1..8946dcb81 100644 --- a/WickedEngine/Server.cpp +++ b/WickedEngine/wiServer.cpp @@ -1,4 +1,4 @@ -#include "Server.h" +#include "wiServer.h" #ifndef WINSTORE_SUPPORT diff --git a/WickedEngine/Server.h b/WickedEngine/wiServer.h similarity index 99% rename from WickedEngine/Server.h rename to WickedEngine/wiServer.h index 5a3a0a1c3..593c624b3 100644 --- a/WickedEngine/Server.h +++ b/WickedEngine/wiServer.h @@ -4,7 +4,7 @@ #ifndef WINSTORE_SUPPORT -#include "Network.h" +#include "wiNetwork.h" #include #include diff --git a/WickedEngine/Sound.cpp b/WickedEngine/wiSound.cpp similarity index 99% rename from WickedEngine/Sound.cpp rename to WickedEngine/wiSound.cpp index 343a07d6b..57def510e 100644 --- a/WickedEngine/Sound.cpp +++ b/WickedEngine/wiSound.cpp @@ -1,4 +1,4 @@ -#include "Sound.h" +#include "wiSound.h" IXAudio2* wiSoundEffect::pXAudio2; IXAudio2MasteringVoice* wiSoundEffect::pMasterVoice; diff --git a/WickedEngine/Sound.h b/WickedEngine/wiSound.h similarity index 100% rename from WickedEngine/Sound.h rename to WickedEngine/wiSound.h diff --git a/WickedEngine/Sprite.cpp b/WickedEngine/wiSprite.cpp similarity index 96% rename from WickedEngine/Sprite.cpp rename to WickedEngine/wiSprite.cpp index 95bce632e..0d235c53b 100644 --- a/WickedEngine/Sprite.cpp +++ b/WickedEngine/wiSprite.cpp @@ -1,8 +1,8 @@ -#include "Sprite.h" -#include "ResourceManager.h" -#include "ImageEffects.h" -#include "Image.h" -#include "Renderer.h" +#include "wiSprite.h" +#include "wiResourceManager.h" +#include "wiImageEffects.h" +#include "wiImage.h" +#include "wiRenderer.h" wiSprite::wiSprite() diff --git a/WickedEngine/Sprite.h b/WickedEngine/wiSprite.h similarity index 96% rename from WickedEngine/Sprite.h rename to WickedEngine/wiSprite.h index c80323d2d..8c3ffe2d3 100644 --- a/WickedEngine/Sprite.h +++ b/WickedEngine/wiSprite.h @@ -1,6 +1,6 @@ #pragma once -#include "Image.h" -#include "ImageEffects.h" +#include "wiImage.h" +#include "wiImageEffects.h" class wiSprite : public wiImage { diff --git a/WickedEngine/TaskThread.h b/WickedEngine/wiTaskThread.h similarity index 100% rename from WickedEngine/TaskThread.h rename to WickedEngine/wiTaskThread.h diff --git a/WickedEngine/TextureHelper.cpp b/WickedEngine/wiTextureHelper.cpp similarity index 99% rename from WickedEngine/TextureHelper.cpp rename to WickedEngine/wiTextureHelper.cpp index ece16e230..14b1e2e46 100644 --- a/WickedEngine/TextureHelper.cpp +++ b/WickedEngine/wiTextureHelper.cpp @@ -1,4 +1,4 @@ -#include "TextureHelper.h" +#include "wiTextureHelper.h" #include "wiRandom.h" wiTextureHelper::wiTextureHelperInstance* wiTextureHelper::instance = nullptr; diff --git a/WickedEngine/TextureHelper.h b/WickedEngine/wiTextureHelper.h similarity index 99% rename from WickedEngine/TextureHelper.h rename to WickedEngine/wiTextureHelper.h index 2cdb849ad..af660b077 100644 --- a/WickedEngine/TextureHelper.h +++ b/WickedEngine/wiTextureHelper.h @@ -1,5 +1,5 @@ #pragma once -#include "Renderer.h" +#include "wiRenderer.h" #include "wiColor.h" #include "CommonInclude.h" diff --git a/WickedEngine/Timer.cpp b/WickedEngine/wiTimer.cpp similarity index 93% rename from WickedEngine/Timer.cpp rename to WickedEngine/wiTimer.cpp index 160c59245..18349bc22 100644 --- a/WickedEngine/Timer.cpp +++ b/WickedEngine/wiTimer.cpp @@ -1,5 +1,5 @@ -#include "Timer.h" -#include "WickedHelper.h" +#include "wiTimer.h" +#include "wiHelper.h" double Timer::PCFreq=0; __int64 Timer::CounterStart=0; diff --git a/WickedEngine/Timer.h b/WickedEngine/wiTimer.h similarity index 100% rename from WickedEngine/Timer.h rename to WickedEngine/wiTimer.h diff --git a/WickedEngine/wiXInput.cpp b/WickedEngine/wiXInput.cpp new file mode 100644 index 000000000..ac5a828a0 --- /dev/null +++ b/WickedEngine/wiXInput.cpp @@ -0,0 +1,52 @@ +#include +#include "wiXInput.h" + + +XInput::XInput(void) +{ + g_bDeadZoneOn = true; + for(int i=0;i #if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)