瀏覽代碼

Actor::calcBounds2 virtual now

dmuratshin 9 年之前
父節點
當前提交
28a6eb212a
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 1 1
      oxygine/src/Actor.h
  2. 3 2
      oxygine/src/VisualStyle.h

+ 1 - 1
oxygine/src/Actor.h

@@ -340,7 +340,7 @@ namespace oxygine
         virtual void onRemovedFromStage() {}
         virtual void onRemovedFromStage() {}
         virtual void transformUpdated() {}
         virtual void transformUpdated() {}
         virtual bool getBounds(RectF&) const { return false; }
         virtual bool getBounds(RectF&) const { return false; }
-        void calcBounds2(RectF& bounds, const Transform& transform) const;
+        virtual void calcBounds2(RectF& bounds, const Transform& transform) const;
 
 
 
 
         typedef intrusive_list<spActor> children;
         typedef intrusive_list<spActor> children;

+ 3 - 2
oxygine/src/VisualStyle.h

@@ -44,8 +44,9 @@ namespace oxygine
 
 
         typedef Property<Color, const Color&, VStyleActor, &VStyleActor::getColor, &VStyleActor::setColor> TweenColor;
         typedef Property<Color, const Color&, VStyleActor, &VStyleActor::getColor, &VStyleActor::setColor> TweenColor;
 
 
-    protected:
-        bool getBounds(RectF& b) const  OVERRIDE {b = getDestRect() ;  return true; }
+		bool getBounds(RectF& b) const  OVERRIDE { b = getDestRect();  return true; }
+
+    protected:        
         VisualStyle _vstyle;
         VisualStyle _vstyle;
     };
     };