Przeglądaj źródła

Preparation to using kNet: renamed SharedPtr.h to Ptr.h to avoid conflicts.

Lasse Öörni 14 lat temu
rodzic
commit
07fda9f32e
38 zmienionych plików z 37 dodań i 37 usunięć
  1. 1 1
      Engine/Audio/Audio.h
  2. 1 1
      Engine/Audio/Sound.h
  3. 0 0
      Engine/Container/ArrayPtr.h
  4. 0 0
      Engine/Container/Ptr.h
  5. 1 1
      Engine/Core/Attribute.h
  6. 1 1
      Engine/Core/Object.h
  7. 1 1
      Engine/Graphics/Animation.h
  8. 1 1
      Engine/Graphics/AnimationState.h
  9. 1 1
      Engine/Graphics/Batch.h
  10. 1 1
      Engine/Graphics/DebugRenderer.h
  11. 1 1
      Engine/Graphics/Direct3D9/D3D9GPUObject.h
  12. 1 1
      Engine/Graphics/Direct3D9/D3D9IndexBuffer.h
  13. 1 1
      Engine/Graphics/Direct3D9/D3D9RenderSurface.h
  14. 1 1
      Engine/Graphics/Direct3D9/D3D9ShaderVariation.h
  15. 1 1
      Engine/Graphics/Direct3D9/D3D9Texture2D.h
  16. 1 1
      Engine/Graphics/Direct3D9/D3D9TextureCube.h
  17. 1 1
      Engine/Graphics/Direct3D9/D3D9VertexBuffer.h
  18. 1 1
      Engine/Graphics/Geometry.h
  19. 2 2
      Engine/Graphics/Model.h
  20. 1 1
      Engine/Graphics/OcclusionBuffer.h
  21. 1 1
      Engine/Graphics/OpenGL/OGLGPUObject.h
  22. 1 1
      Engine/Graphics/OpenGL/OGLIndexBuffer.h
  23. 1 1
      Engine/Graphics/OpenGL/OGLRenderSurface.h
  24. 1 1
      Engine/Graphics/OpenGL/OGLShader.h
  25. 1 1
      Engine/Graphics/OpenGL/OGLShaderVariation.h
  26. 1 1
      Engine/Graphics/OpenGL/OGLTexture.h
  27. 1 1
      Engine/Graphics/OpenGL/OGLTexture2D.h
  28. 1 1
      Engine/Graphics/OpenGL/OGLTextureCube.h
  29. 1 1
      Engine/Graphics/OpenGL/OGLVertexBuffer.h
  30. 1 1
      Engine/IO/FileSystem.cpp
  31. 1 1
      Engine/Physics/CollisionShape.h
  32. 1 1
      Engine/Resource/Image.h
  33. 1 1
      Engine/Resource/XMLElement.h
  34. 1 1
      Engine/Resource/XMLFile.cpp
  35. 1 1
      Engine/Script/ScriptFile.cpp
  36. 1 1
      Engine/UI/Font.h
  37. 1 1
      Tools/PackageTool/PackageTool.cpp
  38. 1 1
      Tools/RampGenerator/RampGenerator.cpp

+ 1 - 1
Engine/Audio/Audio.h

@@ -28,7 +28,7 @@
 #include "Object.h"
 #include "Quaternion.h"
 #include "Thread.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class AudioImpl;
 class Sound;

+ 1 - 1
Engine/Audio/Sound.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "Resource.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 /// Sound resource
 class Sound : public Resource

+ 0 - 0
Engine/Container/SharedArrayPtr.h → Engine/Container/ArrayPtr.h


+ 0 - 0
Engine/Container/SharedPtr.h → Engine/Container/Ptr.h


+ 1 - 1
Engine/Core/Attribute.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Variant.h"
 
 /// Attribute used only for disk serialization

+ 1 - 1
Engine/Core/Object.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Variant.h"
 
 class Context;

+ 1 - 1
Engine/Graphics/Animation.h

@@ -25,7 +25,7 @@
 
 #include "Quaternion.h"
 #include "Resource.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Vector3.h"
 
 /// Skeletal animation keyframe

+ 1 - 1
Engine/Graphics/AnimationState.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "HashMap.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 
 class Animation;
 class AnimatedModel;

+ 1 - 1
Engine/Graphics/Batch.h

@@ -26,7 +26,7 @@
 #include "HashMap.h"
 #include "MathDefs.h"
 #include "GraphicsDefs.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Vector4.h"
 
 class Camera;

+ 1 - 1
Engine/Graphics/DebugRenderer.h

@@ -26,7 +26,7 @@
 #include "Color.h"
 #include "Component.h"
 #include "Frustum.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 
 class BoundingBox;
 class Camera;

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9GPUObject.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "SharedPtr.h"
+#include "Ptr.h"
 
 class Graphics;
 

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9IndexBuffer.h

@@ -26,7 +26,7 @@
 #include "GPUObject.h"
 #include "Object.h"
 #include "GraphicsDefs.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 /// Hardware index buffer
 class IndexBuffer : public Object, public GPUObject

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9RenderSurface.h

@@ -25,7 +25,7 @@
 
 #include "Rect.h"
 #include "GraphicsDefs.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 
 class Camera;
 class Scene;

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9ShaderVariation.h

@@ -27,7 +27,7 @@
 #include "GraphicsDefs.h"
 #include "HashSet.h"
 #include "RefCounted.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class Shader;
 

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9Texture2D.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "RenderSurface.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Texture.h"
 
 class Image;

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9TextureCube.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "RenderSurface.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Texture.h"
 
 class Deserializer;

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9VertexBuffer.h

@@ -25,7 +25,7 @@
 
 #include "GPUObject.h"
 #include "GraphicsDefs.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 /// Hardware vertex buffer
 class VertexBuffer : public Object, public GPUObject

+ 1 - 1
Engine/Graphics/Geometry.h

@@ -25,7 +25,7 @@
 
 #include "GraphicsDefs.h"
 #include "Object.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class IndexBuffer;
 class Ray;

+ 2 - 2
Engine/Graphics/Model.h

@@ -26,8 +26,8 @@
 #include "BoundingBox.h"
 #include "Skeleton.h"
 #include "Resource.h"
-#include "SharedPtr.h"
-#include "SharedArrayPtr.h"
+#include "Ptr.h"
+#include "ArrayPtr.h"
 
 class Geometry;
 class IndexBuffer;

+ 1 - 1
Engine/Graphics/OcclusionBuffer.h

@@ -26,7 +26,7 @@
 #include "Frustum.h"
 #include "Object.h"
 #include "GraphicsDefs.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class BoundingBox;
 class Camera;

+ 1 - 1
Engine/Graphics/OpenGL/OGLGPUObject.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "SharedPtr.h"
+#include "Ptr.h"
 
 class Graphics;
 

+ 1 - 1
Engine/Graphics/OpenGL/OGLIndexBuffer.h

@@ -26,7 +26,7 @@
 #include "GPUObject.h"
 #include "Object.h"
 #include "GraphicsDefs.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 /// Hardware index buffer
 class IndexBuffer : public Object, public GPUObject

+ 1 - 1
Engine/Graphics/OpenGL/OGLRenderSurface.h

@@ -25,7 +25,7 @@
 
 #include "Rect.h"
 #include "GraphicsDefs.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 
 class Camera;
 class Scene;

+ 1 - 1
Engine/Graphics/OpenGL/OGLShader.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "Resource.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class ShaderVariation;
 

+ 1 - 1
Engine/Graphics/OpenGL/OGLShaderVariation.h

@@ -26,7 +26,7 @@
 #include "GPUObject.h"
 #include "GraphicsDefs.h"
 #include "RefCounted.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class Shader;
 class ShaderProgram;

+ 1 - 1
Engine/Graphics/OpenGL/OGLTexture.h

@@ -28,7 +28,7 @@
 #include "Image.h"
 #include "GraphicsDefs.h"
 #include "Resource.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 static const int MAX_TEXTURE_QUALITY_LEVELS = 3;
 

+ 1 - 1
Engine/Graphics/OpenGL/OGLTexture2D.h

@@ -25,7 +25,7 @@
 
 #include "Image.h"
 #include "RenderSurface.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Texture.h"
 
 /// 2D texture resource

+ 1 - 1
Engine/Graphics/OpenGL/OGLTextureCube.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "RenderSurface.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Texture.h"
 
 class Deserializer;

+ 1 - 1
Engine/Graphics/OpenGL/OGLVertexBuffer.h

@@ -25,7 +25,7 @@
 
 #include "GPUObject.h"
 #include "GraphicsDefs.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 /// Hardware vertex buffer
 class VertexBuffer : public Object, public GPUObject

+ 1 - 1
Engine/IO/FileSystem.cpp

@@ -26,7 +26,7 @@
 #include "File.h"
 #include "FileSystem.h"
 #include "Log.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 #include <cstdio>
 #include <cstring>

+ 1 - 1
Engine/Physics/CollisionShape.h

@@ -27,7 +27,7 @@
 #include "Component.h"
 #include "Quaternion.h"
 #include "PhysicsDefs.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class DebugRenderer;
 class Geometry;

+ 1 - 1
Engine/Resource/Image.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "Resource.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 /// Supported compressed image formats
 enum CompressedFormat

+ 1 - 1
Engine/Resource/XMLElement.h

@@ -25,7 +25,7 @@
 
 #include "BoundingBox.h"
 #include "Rect.h"
-#include "SharedPtr.h"
+#include "Ptr.h"
 #include "Variant.h"
 
 class TiXmlElement;

+ 1 - 1
Engine/Resource/XMLFile.cpp

@@ -25,7 +25,7 @@
 #include "Context.h"
 #include "File.h"
 #include "Log.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 #include "XMLFile.h"
 
 #include <tinyxml.h>

+ 1 - 1
Engine/Script/ScriptFile.cpp

@@ -30,7 +30,7 @@
 #include "Script.h"
 #include "ScriptFile.h"
 #include "ScriptInstance.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 #include <angelscript.h>
 #include <cstring>

+ 1 - 1
Engine/UI/Font.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "Resource.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 class Graphics;
 class Texture;

+ 1 - 1
Tools/PackageTool/PackageTool.cpp

@@ -25,7 +25,7 @@
 #include "File.h"
 #include "FileSystem.h"
 #include "ProcessUtils.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 
 #include <cstdio>
 #include <cstdlib>

+ 1 - 1
Tools/RampGenerator/RampGenerator.cpp

@@ -23,7 +23,7 @@
 
 #include "MathDefs.h"
 #include "ProcessUtils.h"
-#include "SharedArrayPtr.h"
+#include "ArrayPtr.h"
 #include "StringUtils.h"
 
 #include <stb_image.h>