wip

oxygine/src/core/ImageDataOperations.h

@@ -4,8 +4,6 @@
 
 namespace oxygine
 {
-    class Color;
-
     namespace operations
     {
         //based on memcpy

oxygine/src/core/NativeTexture.h

@@ -7,13 +7,6 @@
 
 namespace oxygine
 {
-
-    DECLARE_SMART(NativeTexture, spNativeTexture);
-    DECLARE_SMART(RenderTexture, spRenderTexture);
-
-    typedef void* nativeTextureHandle;
-
-
     class NativeTexture: public Texture, public Restorable
     {
     public:

oxygine/src/core/Object.h

@@ -6,8 +6,6 @@
 
 namespace oxygine
 {
-//#define OBJECT_POOL_ALLOCATOR 0
-
     class PoolObject
     {
     public:

oxygine/src/core/Renderer.h

@@ -221,16 +221,6 @@ namespace oxygine
         virtual void drawElement(const spNativeTexture& texture, unsigned int color, const RectF& src, const RectF& dest) = 0;
     };
 
-    typedef AffineTransform Transform;
-
-    /*
-    class Renderer
-    {
-    public:
-
-    };
-    */
-
     /**Returns View matrix where Left Top corner is (0,0), and right bottom is (w,h)*/
     Matrix makeViewMatrix(int w, int h, bool flipU = false);
 }

oxygine/src/core/ThreadDispatcher.h

@@ -144,12 +144,6 @@ namespace oxygine
         int _replyingTo;
     };
 
-    typedef  ThreadDispatcher ThreadMessages;
-
-    class ThreadDispatcher2
-    {
-    public:
 
-    protected:
-    };
+    typedef  ThreadDispatcher ThreadMessages;
 }

oxygine/src/core/UberShaderProgram.h

@@ -2,15 +2,9 @@
 #include <vector>
 #include "Restorable.h"
 #include "Object.h"
-//#include <unordered_map>
 
 namespace oxygine
 {
-    class ShaderProgram;
-    class IVideoDriver;
-    DECLARE_SMART(NativeTexture, spNativeTexture);
-
-
     class UberShaderProgramBase: public Restorable
     {
     public:

oxygine/src/core/VideoDriver.h

@@ -9,12 +9,6 @@
 
 namespace oxygine
 {
-    class Color;
-    DECLARE_SMART(NativeTexture, spNativeTexture);
-
-    class ShaderProgram;
-    class VertexDeclaration;
-
     class IVideoDriver
     {
     public:

oxygine/src/core/file.h

@@ -56,7 +56,10 @@ namespace oxygine
         /**Closes opened file handle*/
         void close(handle);
 
+        /**Seeks to file position, whence could be SEEK_SET, SEEK_END, SEEK_CUR*/
         int seek(handle, unsigned int offset, int whence);
+
+        /**Returns current file position*/
         unsigned int tell(handle);
 
         /**Reads bytes into user memory*/

oxygine/src/core/log.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "oxygine-include.h"
 #include <stdarg.h>
+
 namespace oxygine
 {
-    /***/
     namespace log
     {
         /**By default logging is enabled*/

oxygine/src/core/ref_counter.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "oxygine-include.h"
-
 #include "intrusive_ptr.h"
 
 namespace oxygine

oxygine/src/oxygine-forwards.h

@@ -11,6 +11,10 @@ typedef struct SDL_Window SDL_Window;
 
 struct SDL_KeyboardEvent;
 
+namespace pugi
+{
+    class xml_node;
+}
 
 namespace oxygine
 {
@@ -21,6 +25,84 @@ namespace oxygine
     }
 
     class Event;
+    class Color;
+    class Color;
+    DECLARE_SMART(NativeTexture, spNativeTexture);
+
+
+    class Resource;
+    class ResFont;
+    class ResAnim;
+
+    class CreateResourceContext;
+    class LoadResourcesContext;
+    class Resources;
+    class ShaderProgram;
+    class VertexDeclaration;
+
+    class IVideoDriver;
+
+    class ResourcesLoadOptions;
+
+    class ShaderProgram;
+    class IVideoDriver;
+    DECLARE_SMART(NativeTexture, spNativeTexture);
+
+
+    class Resources;
+    class Mem2Native;
+
+    class LoadResourcesContext;
+    class LoadResourcesContext;
+    DECLARE_SMART(Resource, spResource);
+
+    class Resources;
+    class CreateResourceContext;
+    class Restorable;
+
+    DECLARE_SMART(NativeTexture, spNativeTexture);
+    DECLARE_SMART(ResBuffer, spResBuffer);
+
+    class Resources;
+    class XmlWalker;
+    class CreateResourceContext;
+    DECLARE_SMART(NativeTexture, spNativeTexture);
+    class ResAtlas;
+
+    DECLARE_SMART(Texture, spTexture);
+
+
+    class Image;
+
+    DECLARE_SMART(ResAnim, spResAnim);
+
+    class ResFontBM;
+
+    class Resources;
+    class CreateResourceContext;
+
+    class Font;
+
+    DECLARE_SMART(ResFont, spResFont);
+
+    class ThreadDispatcher;
+    class ShaderProgram;
+    DECLARE_SMART(Object, spObject);
+
+    DECLARE_SMART(NativeTexture, spNativeTexture);
+    DECLARE_SMART(RenderTexture, spRenderTexture);
+
+    typedef void* nativeTextureHandle;
+    class Mutex;
+    class ImageData;
+    class SingleResAnim;
+
+
+    class Resources;
+    class Restorable;
+    class CreateResourceContext;
+    DECLARE_SMART(NativeTexture, spNativeTexture);
+    class ResStarlingAtlas;
 
     typedef unsigned int dumpOptions;
     class UberShaderProgram;

oxygine/src/res/CreateResourceContext.h

@@ -8,8 +8,6 @@ namespace oxygine
 {
     bool isMainThread();
 
-    class Resources;
-
     /**internal class*/
     class XmlWalker
     {
@@ -60,7 +58,6 @@ namespace oxygine
         bool _alphaHitTest;
     };
 
-    class ResourcesLoadOptions;
 
     class CreateResourceContext
     {

oxygine/src/res/ResAnim.h

@@ -7,11 +7,7 @@
 
 namespace oxygine
 {
-    DECLARE_SMART(Texture, spTexture);
-
-
     typedef std::vector<AnimationFrame> animationFrames;
-    class Image;
 
     DECLARE_SMART(ResAnim, spResAnim);
     class ResAnim: public Resource

oxygine/src/res/ResAtlas.h

@@ -6,11 +6,6 @@
 
 namespace oxygine
 {
-    class Resources;
-    class XmlWalker;
-    class CreateResourceContext;
-    DECLARE_SMART(NativeTexture, spNativeTexture);
-
     class ResAtlas: public Resource
     {
         INHERITED(Resource);
@@ -59,7 +54,5 @@ namespace oxygine
 
     typedef void(*load_texture_hook)(const std::string& file, spNativeTexture nt, bool linearFilter, bool clamp2edge, LoadResourcesContext* load_context);
     void set_load_texture_hook(load_texture_hook);
-
-    class LoadResourcesContext;
     void load_texture_internal(const std::string& file, spNativeTexture nt, bool linearFilter, bool clamp2edge, LoadResourcesContext* load_context);
 }

oxygine/src/res/ResBuffer.h

@@ -6,9 +6,6 @@
 
 namespace oxygine
 {
-    class Resources;
-    class CreateResourceContext;
-
     class ResBuffer: public Resource
     {
         INHERITED(Resource);

oxygine/src/res/ResFont.h

@@ -1,10 +1,9 @@
 #pragma once
 #include "oxygine-include.h"
 #include "Resource.h"
+
 namespace oxygine
 {
-    class Font;
-
     DECLARE_SMART(ResFont, spResFont);
     class ResFont: public Resource
     {

oxygine/src/res/ResFontBM.h

@@ -6,13 +6,6 @@
 
 namespace oxygine
 {
-    class Resources;
-    class CreateResourceContext;
-    class Restorable;
-
-    DECLARE_SMART(NativeTexture, spNativeTexture);
-
-
     class ResFontBM: public ResFont
     {
     public:

oxygine/src/res/ResStarlingAtlas.h

@@ -3,11 +3,6 @@
 #include "Resource.h"
 namespace oxygine
 {
-    class Resources;
-    class Restorable;
-    class CreateResourceContext;
-    DECLARE_SMART(NativeTexture, spNativeTexture);
-
     class ResStarlingAtlas: public Resource
     {
         INHERITED(Resource);

oxygine/src/res/Resource.h

@@ -6,12 +6,6 @@
 
 namespace oxygine
 {
-    class Resources;
-    class Mem2Native;
-
-    class LoadResourcesContext;
-    class LoadResourcesContext;
-
     DECLARE_SMART(Resource, spResource);
     class Resource: public Object
     {

oxygine/src/res/Resources.h

@@ -13,20 +13,9 @@
 #include <unordered_map>
 #endif
 
-namespace pugi
-{
-    class xml_node;
-}
 
 namespace oxygine
 {
-    class Resource;
-    class ResFont;
-    class ResAnim;
-
-    class CreateResourceContext;
-    class LoadResourcesContext;
-
     class ResourcesLoadOptions
     {
     public: