dmuratshin há 10 anos atrás
pai
commit
7f8350396c
3 ficheiros alterados com 5 adições e 2 exclusões
  1. 1 0
      oxygine/src/ProgressBar.cpp
  2. 1 1
      oxygine/src/Serialize.h
  3. 3 1
      tools/gen_view_code.py

+ 1 - 0
oxygine/src/ProgressBar.cpp

@@ -62,6 +62,7 @@ namespace oxygine
     {
     {
         _originalFrame = f;
         _originalFrame = f;
         _update();
         _update();
+        _Sprite::animFrameChanged(f);
     }
     }
 
 
     void ProgressBar::_update()
     void ProgressBar::_update()

+ 1 - 1
oxygine/src/Serialize.h

@@ -20,7 +20,7 @@ namespace oxygine
         virtual spActor     create(const char* type) const;
         virtual spActor     create(const char* type) const;
         virtual Resource*   getResource(const char* id) const {return 0;}
         virtual Resource*   getResource(const char* id) const {return 0;}
         virtual ResAnim*    getResAnim(const char* id) const {return safeCast<ResAnim*>(getResource(id));}
         virtual ResAnim*    getResAnim(const char* id) const {return safeCast<ResAnim*>(getResource(id));}
-        virtual AnimationFrame getFrame(const char* id, int col, int row) const {return getResAnim(id)->getFrame(col, row);}
+        virtual AnimationFrame getFrame(const char* id, int col, int row) const {ResAnim* rs = getResAnim(id);  if (rs) return rs->getFrame(col, row); return AnimationFrame();}
         virtual ResFont*    getResFont(const char* id) const {return safeCast<ResFont*>(getResource(id));}
         virtual ResFont*    getResFont(const char* id) const {return safeCast<ResFont*>(getResource(id));}
     };
     };
 
 

+ 3 - 1
tools/gen_view_code.py

@@ -158,7 +158,9 @@ def gen2(xml_res_file, dest_folder, mappings):
     doc = minidom.parse(xml_res_file)
     doc = minidom.parse(xml_res_file)
     root = doc.documentElement
     root = doc.documentElement
 
 
-    folder = os.path.split(__file__)[0] + "/gen_view_code/templates"
+    folder = os.path.dirname(os.path.abspath(__file__)) + "/gen_view_code/templates"
+    print(folder)
+
     env = Environment(trim_blocks=True, lstrip_blocks=True,
     env = Environment(trim_blocks=True, lstrip_blocks=True,
                       loader=FileSystemLoader(folder))
                       loader=FileSystemLoader(folder))