dmuratshin 9 gadi atpakaļ
vecāks
revīzija
6f8d0159c0

+ 2 - 0
oxygine/src/STDMaterial.h

@@ -1,6 +1,8 @@
 #pragma once
+#include "oxygine_include.h"
 #include "STDRenderer.h"
 #include "Material.h"
+
 namespace oxygine
 {
     class ClipRectActor;

+ 1 - 1
oxygine/src/core/ThreadDispatcher.h

@@ -22,7 +22,7 @@ namespace oxygine
         pthread_mutex_t& _mutex;
         bool _locked;
     };
-	/*
+    /*
     class TDMessage
     {
     public:

+ 1 - 0
oxygine/src/math/Color.h

@@ -11,6 +11,7 @@ namespace oxygine
         enum
         {
             /**ABGR(LE) colors table*/
+            Zero                 = 0x00000000,
             AliceBlue            = 0xF0F8FFFF,
             AntiqueWhite         = 0xFAEBD7FF,
             Aqua                 = 0x00FFFFFF,

+ 1 - 1
oxygine/src/res/ResAnim.h

@@ -24,7 +24,7 @@ namespace oxygine
         virtual void init(Image* original, int columns = 1, int rows = 1, float scaleFactor = 1.0f);
         void init(animationFrames& frames, int columns, float scaleFactor = 1.0f, float appliedScale = 1.0f);
         /**creates animation frames from NativeTexture*/
-        void init(spNativeTexture texture, const Point& originalSize, int columns, int rows, float scaleFactor);
+        void init(spNativeTexture texture, const Point& originalSize, int columns = 1, int rows = 1, float scaleFactor = 1.0f);
 
         /*adds additional column. use it only if rows = 1*/
         //void addFrame(const AnimationFrame &frame);