diff options
| -rw-r--r-- | liveengine/bin/data/knights.xml | 2 | ||||
| -rw-r--r-- | liveengine/bin/data/military_ladies.xml | 2 | ||||
| -rw-r--r-- | liveengine/bin/data/reptiles.xml | 2 | ||||
| -rw-r--r-- | liveengine/src/layers.cpp | 10 | ||||
| -rw-r--r-- | liveengine/src/layers.h | 6 | ||||
| -rw-r--r-- | liveengine/src/main.cpp | 2 | ||||
| -rw-r--r-- | liveengine/src/playlist.cpp | 10 |
7 files changed, 21 insertions, 13 deletions
diff --git a/liveengine/bin/data/knights.xml b/liveengine/bin/data/knights.xml index 2428960..3b4d5f1 100644 --- a/liveengine/bin/data/knights.xml +++ b/liveengine/bin/data/knights.xml @@ -30,7 +30,7 @@ <svglayer note="63" file="mil_knights/knight35.WMF.svg"/>
<svglayer note="64" file="mil_knights/knight36.WMF.svg"/>
<svglayer note="65" file="mil_knights/knight37.WMF.svg"/>
- <svglayer note="66" file="mil_knights/knight38.WMF.svg"/>
+
<svglayer note="67" file="mil_knights/knight39.WMF.svg"/>
<svglayer note="68" file="mil_knights/knight40.WMF.svg"/>
<svglayer note="69" file="mil_knights/knight41.WMF.svg"/>
diff --git a/liveengine/bin/data/military_ladies.xml b/liveengine/bin/data/military_ladies.xml index c5aeaee..f61bece 100644 --- a/liveengine/bin/data/military_ladies.xml +++ b/liveengine/bin/data/military_ladies.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?>
<playlist>
- <svglayer note="36" file="military_ladies/LH01100A.WMF.svg"/>
+
<svglayer note="37" file="military_ladies/LH01116A.WMF.svg"/>
<svglayer note="38" file="military_ladies/LH01117A.WMF.svg"/>
<svglayer note="39" file="military_ladies/LH01118A.WMF.svg"/>
diff --git a/liveengine/bin/data/reptiles.xml b/liveengine/bin/data/reptiles.xml index 8a6f7a1..7113a35 100644 --- a/liveengine/bin/data/reptiles.xml +++ b/liveengine/bin/data/reptiles.xml @@ -16,7 +16,7 @@ <svglayer note="49" file="reptiles/AA01014A.WMF.svg"/>
<svglayer note="50" file="reptiles/AA01015A.WMF.svg"/>
<svglayer note="51" file="reptiles/AA01016A.WMF.svg"/>
- <svglayer note="52" file="reptiles/AA01017A.WMF.svg"/>
+ <svglayer note="52" file="reptiles/CS000343.WMF.svg"/>
<svglayer note="53" file="reptiles/AA01018A.WMF.svg"/>
<svglayer note="54" file="reptiles/AA01019A.WMF.svg"/>
<svglayer note="55" file="reptiles/AA01020A.WMF.svg"/>
diff --git a/liveengine/src/layers.cpp b/liveengine/src/layers.cpp index d2698ef..d7c7d77 100644 --- a/liveengine/src/layers.cpp +++ b/liveengine/src/layers.cpp @@ -8,7 +8,8 @@ svglayer::svglayer(string _f) load(_f);
}
-void svglayer::load(string _f){
+int svglayer::load(string _f){ + //check if files exits
svg.load(_f);
printf("%i paths\n",svg.getNumPath());
for (int i=0;i<svg.getNumPath();i++) { @@ -16,8 +17,11 @@ void svglayer::load(string _f){ strokes.push_back(svg.getPathAt(i).getStrokeColor());
printf(" path %i: fill %08x stroke %08x\n",i,svg.getPathAt(i).getFillColor().getHex(),svg.getPathAt(i).getStrokeColor().getHex());
} - xo=(ofGetWidth()-svg.getWidth())/2; - yo=(ofGetHeight()-svg.getHeight())/2;
+ if (svg.getNumPath()>0) { + xo=(ofGetWidth()-svg.getWidth())/2; + yo=(ofGetHeight()-svg.getHeight())/2; + } + isLoaded= (svg.getNumPath()>0);
}
void svglayer::draw(float a) {
diff --git a/liveengine/src/layers.h b/liveengine/src/layers.h index 11e50ab..2ebbd53 100644 --- a/liveengine/src/layers.h +++ b/liveengine/src/layers.h @@ -11,9 +11,11 @@ class layer virtual ~layer(){};
virtual void load(string _f){};
virtual void draw(float a){}; - virtual void draw(float a,unsigned char* controllers){ draw(a);};
+ virtual void draw(float a,unsigned char* controllers){ draw(a);}; + virtual bool getLoaded();
protected:
- private:
+ private: + bool isLoaded;
};
class svglayer: public layer
diff --git a/liveengine/src/main.cpp b/liveengine/src/main.cpp index 192f275..41470a2 100644 --- a/liveengine/src/main.cpp +++ b/liveengine/src/main.cpp @@ -6,7 +6,7 @@ int main( ){ ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_FULLSCREEN); // <-------- setup the GL context + ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context //ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // this kicks off the running of my app diff --git a/liveengine/src/playlist.cpp b/liveengine/src/playlist.cpp index 3063595..af44940 100644 --- a/liveengine/src/playlist.cpp +++ b/liveengine/src/playlist.cpp @@ -39,9 +39,10 @@ void playlist::loadsvg(){ layers[XML.getAttribute("svglayer", "note", 0,i)]=new svglayer(XML.getAttribute("svglayer", "file", "",i));
}
}
- else printf("no SVG layers loaded!\n");
+ else printf("no SVG layers loaded!\n"); + XML.popTag();
} - XML.popTag(); + } void playlist::loadimg(){ @@ -56,9 +57,10 @@ void playlist::loadimg(){ layers[XML.getAttribute("imglayer", "note", 0,i)]=new imglayer(XML.getAttribute("imglayer", "file", "",i));
}
}
- else printf("no IMG layers loaded!\n");
+ else printf("no IMG layers loaded!\n"); + XML.popTag();
} - XML.popTag(); + } playlist::~playlist()
|