- minor fixes

oxygine/src/AnimationFrame.cpp

@@ -67,13 +67,13 @@ namespace oxygine
 
         return f;
     }
-    
+
     void AnimationFrame::flipX()
     {
         _srcRect.setX(_srcRect.getRight());
         _srcRect.setWidth(-_srcRect.getWidth());
     }
-    
+
     void AnimationFrame::flipY()
     {
         _srcRect.setY(_srcRect.getBottom());

oxygine/src/AnimationFrame.h

@@ -61,7 +61,7 @@ namespace oxygine
         void            setDiffuse(const Diffuse& d) { _diffuse = d; }
         void            setSize(const Vector2& size) {_frameSize = size;}
         void            setHitTestData(const HitTestData& ad) { _hittest = ad; }
-        
+
         void            flipX();
         void            flipY();
 

oxygine/src/Sprite.cpp

@@ -108,7 +108,7 @@ namespace oxygine
         }
         return false;
     }
-    
+
     void Sprite::setFlippedX(bool flippedX)
     {
         if (flippedX != isFlippedX())
@@ -118,7 +118,7 @@ namespace oxygine
             animFrameChanged(_frame);
         }
     }
-    
+
     void Sprite::setFlippedY(bool flippedY)
     {
         if (flippedY != isFlippedY())
@@ -139,13 +139,13 @@ namespace oxygine
             _frame.flipX();
             _flags ^= flag_flipX;
         }
-        
+
         if (fy)
         {
             _frame.flipY();
             _flags ^= flag_flipY;
         }
-        
+
         if (fx || fy)
             animFrameChanged(_frame);
     }

oxygine/src/Sprite.h

@@ -41,7 +41,7 @@ namespace oxygine
         void                    setColumn(int column, int row = -1);
 
         bool                    isOn(const Vector2& localPosition);
-        
+
         bool                    isFlippedX() const {return (_flags & flag_flipX) != 0;}
         bool                    isFlippedY() const {return (_flags & flag_flipY) != 0;}
         void                    setFlippedX(bool flippedX);

oxygine/src/TweenAlphaFade.h

@@ -19,13 +19,13 @@ namespace oxygine
         unsigned char _a;
         bool _fadeIn;
 
-		enum options
-		{
-			opt_singleR2T = 1,
-			opt_fullscreen = 1,
-		};
+        enum options
+        {
+            opt_singleR2T = 1,
+            opt_fullscreen = 1,
+        };
 
-		int _options;
+        int _options;
 
         TweenAlphaFade(bool fadeIn, int opt = opt_singleR2T) : _actor(0), _prev(0), _fadeIn(fadeIn), _options(opt) {}
 
@@ -85,61 +85,61 @@ namespace oxygine
             if (!STDRenderer::isReady())
                 return;
 
-			IVideoDriver* driver = IVideoDriver::instance;
+            IVideoDriver* driver = IVideoDriver::instance;
+
 
 
+            Actor& actor = *_actor;
+            Rect screen = getScreenRect(actor);
 
-			Actor& actor = *_actor;
-			Rect screen = getScreenRect(actor);
-			
-			if (_options & opt_fullscreen)
-			{
-				driver->getViewport(screen);				
-			}
+            if (_options & opt_fullscreen)
+            {
+                driver->getViewport(screen);
+            }
 
 
-			if (_rt->getWidth() < screen.getWidth() || _rt->getHeight() < screen.getHeight())
-				_rt->init(screen.getWidth(), screen.getHeight(), TF_R8G8B8A8, true);
+            if (_rt->getWidth() < screen.getWidth() || _rt->getHeight() < screen.getHeight())
+                _rt->init(screen.getWidth(), screen.getHeight(), TF_R8G8B8A8, true);
 
-			driver->setRenderTarget(_rt);
+            driver->setRenderTarget(_rt);
 
-			Rect vp = screen;
-			vp.pos = Point(0, 0);
-			driver->setViewport(vp);
-			driver->clear(0);
+            Rect vp = screen;
+            vp.pos = Point(0, 0);
+            driver->setViewport(vp);
+            driver->clear(0);
 
 
-			RenderState rs;
-			Material* mat = STDMaterial::instance;
-			STDRenderer* renderer = STDMaterial::instance->getRenderer();
-			rs.material = mat;
+            RenderState rs;
+            Material* mat = STDMaterial::instance;
+            STDRenderer* renderer = STDMaterial::instance->getRenderer();
+            rs.material = mat;
 
-			renderer->initCoordinateSystem(vp.getWidth(), vp.getHeight(), true);
+            renderer->initCoordinateSystem(vp.getWidth(), vp.getHeight(), true);
 
-			if (_options & opt_fullscreen)
-			{
-				rs.transform = getGlobalTransform(_actor->getParent());
-				mat->render(&actor, rs);
-			}
-			else
-			{
-				AffineTransform copy = actor.getTransform();
+            if (_options & opt_fullscreen)
+            {
+                rs.transform = getGlobalTransform(_actor->getParent());
+                mat->render(&actor, rs);
+            }
+            else
+            {
+                AffineTransform copy = actor.getTransform();
 
-				AffineTransform transform;
-				transform.identity();
-				Vector2 gpos = actor._getStage()->local2global(convert_local2stage(&actor, Vector2(0, 0)));
-				Vector2 offset = gpos - screen.pos.cast<Vector2>();
-				transform.translate(offset);
-				transform.scale(actor.getScale());
-				actor.setTransform(transform);
+                AffineTransform transform;
+                transform.identity();
+                Vector2 gpos = actor._getStage()->local2global(convert_local2stage(&actor, Vector2(0, 0)));
+                Vector2 offset = gpos - screen.pos.cast<Vector2>();
+                transform.translate(offset);
+                transform.scale(actor.getScale());
+                actor.setTransform(transform);
 
-				mat->render(&actor, rs);
+                mat->render(&actor, rs);
 
-				//restore original transform
-				actor.setTransform(copy);
-			}
+                //restore original transform
+                actor.setTransform(copy);
+            }
 
-			mat->finish();
+            mat->finish();
             driver->setRenderTarget(0);
         }
 

oxygine/src/core/intrusive_ptr.h

@@ -139,7 +139,7 @@ namespace oxygine
     class RefHolder : public T
     {
     public:
-        RefHolder() {this->_ref_counter = -1;}
+        RefHolder() {this->_ref_counter = 1000000;}
         void addRef()
         {}
 

oxygine/src/text_utils/Node.cpp

@@ -184,8 +184,12 @@ namespace oxygine
                             rd.nextLine();
                         else
                         {
-                            s.gl = *font->getGlyph(_defMissing);
-                            i += rd.putSymbol(s);
+                            gl = font->getGlyph(_defMissing);
+                            if (gl)//even 'missing' symbol  could be missing
+                            {
+                                s.gl = *gl;
+                                i += rd.putSymbol(s);
+                            }
                         }
                     }
                     ++i;