Merge pull request #578 from fodinabor/SpriteExampleFix

ivansafrin · ivansafrin · commit c5aefde3bb8f · 2014-12-28T10:56:44.000-05:00
Updates the SceneSprite example
diff --git a/Core/Contents/Include/PolySceneSprite.h b/Core/Contents/Include/PolySceneSprite.h
@@ -119,7 +119,7 @@ namespace Polycode {
     
     class SpriteSet : public ResourcePool {
     public:
-        SpriteSet(String imageFileName, ResourcePool *parentPool);
+        SpriteSet(String imageFileName, ResourcePool *parentPool = CoreServices::getInstance()->getResourceManager()->getGlobalPool());
         ~SpriteSet();
         
         void setTexture(Texture *texture);
diff --git a/Examples/C++/Contents/SceneSprites/HelloPolycodeApp.cpp b/Examples/C++/Contents/SceneSprites/HelloPolycodeApp.cpp
@@ -1,7 +1,6 @@
 #include "HelloPolycodeApp.h"
 
 HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
-
 	core = new POLYCODE_CORE(view, 640,480,false,true,0,0,90, 0, true);
 
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
@@ -12,11 +11,12 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	Scene *scene = new Scene(Scene::SCENE_2D);
     scene->getActiveCamera()->setOrthoSize(640, 480);
     
-	SceneSprite *sprite = new SceneSprite("Resources/sprite_sheet.png", 93, 78);
-	sprite->setScale(6,6);
-	scene->addChild(sprite);
-	sprite->addAnimation("ExampleAnimation", "0-29,29x6", 0.03);
-	sprite->playAnimation("ExampleAnimation", 0, false);
+	SpriteSet *sprite = new SpriteSet("Resources/sprite_set.sprites");
+	SceneSprite *sceneSprite = new SceneSprite(sprite);
+	sceneSprite->setSpriteByName("Explosion");
+	sceneSprite->setSpriteStateByName("default", 0, false);
+	sceneSprite->setScale(4, 4);
+	scene->addEntity(sceneSprite);
 }
 
 HelloPolycodeApp::~HelloPolycodeApp() {
diff --git a/Examples/C++/Resources/explosion.png b/Examples/C++/Resources/explosion.png
diff --git a/Examples/C++/Resources/sprite_set.sprites b/Examples/C++/Resources/sprite_set.sprites
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<sprite_set>
+    <sprite_sheet fileName="Resources/explosion.png">
+        <frames>
+            <frame id="0" x="0" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="1" x="0.0555556" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="2" x="0.111111" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="3" x="0.166667" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="4" x="0.222222" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="5" x="0.277778" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="6" x="0.333333" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="7" x="0.388889" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="8" x="0.444444" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="9" x="0.5" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="10" x="0.555556" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="11" x="0.611111" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="12" x="0.666667" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="13" x="0.722222" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="14" x="0.777778" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="15" x="0.833333" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+            <frame id="16" x="0.888889" y="0" w="0.0555556" h="1" ax="0" ay="0" />
+        </frames>
+    </sprite_sheet>
+    <sprites>
+        <sprite name="Explosion">
+            <states>
+                <state name="default" fps="20" scale="1" width="32" height="32" offset_x="0" offset_y="0" frame_ids="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16" />
+            </states>
+        </sprite>
+    </sprites>
+</sprite_set>
diff --git a/IDE/Contents/Source/PolycodeSpriteEditor.cpp b/IDE/Contents/Source/PolycodeSpriteEditor.cpp
@@ -960,8 +960,8 @@ void SpriteStateEditBar::refreshBar() {
     meshGrips->clearMesh();
     meshGrips->indexedMesh = true;
     
-    Number frameOffset;
-    Number frameSize;
+    Number frameOffset = 0;
+    Number frameSize = 0;
     
     unsigned int offset = 0;
     unsigned int offsetIcon = 0;
diff --git a/Modules/Contents/UI/Include/PolyUIScrollContainer.h b/Modules/Contents/UI/Include/PolyUIScrollContainer.h
@@ -104,9 +104,9 @@ namespace Polycode {
         */
 		Number getVScrollWidth();
 
-		UIVScrollBar *getVScrollBar() { return vScrollBar; }
-		UIHScrollBar *getHScrollBar() { return hScrollBar; }
-		
+		UIVScrollBar *getVScrollBar();
+		UIHScrollBar *getHScrollBar();
+				
 	private:		
 		
 		Number defaultScrollSize;
@@ -119,8 +119,8 @@ namespace Polycode {
 		bool hasHScroll;
 		bool hasVScroll;
 
-		UIVScrollBar *vScrollBar;
 		UIHScrollBar *hScrollBar;
+		UIVScrollBar *vScrollBar;
 	};
 
 }
diff --git a/Modules/Contents/UI/Source/PolyUIScrollContainer.cpp b/Modules/Contents/UI/Source/PolyUIScrollContainer.cpp
@@ -115,6 +115,10 @@ Number UIScrollContainer::getVScrollWidth() {
 	}
 }
 
+UIVScrollBar *UIScrollContainer::getVScrollBar() { return vScrollBar; }
+
+UIHScrollBar *UIScrollContainer::getHScrollBar() { return hScrollBar; }
+
 void UIScrollContainer::setContentSize(Number newContentWidth, Number newContentHeight) {
     
     if(newContentWidth < 1.0)
diff --git a/Modules/Contents/UI/Source/PolyUITextInput.cpp b/Modules/Contents/UI/Source/PolyUITextInput.cpp
@@ -2396,7 +2396,7 @@ void UITextInput::updateWordWrap(int lineStart, int lineEnd) {
 void UITextInput::readjustBuffer(int lineStart, int lineEnd) {
 
 	if(scrollContainer) {
-		scrollContainer->getVScrollBar()->setTickSize((UI_TEXT_INPUT_SCROLL_SPEED * lineHeight) /scrollContainer->getContentSize().y);
+		scrollContainer->getVScrollBar()->setTickSize((UI_TEXT_INPUT_SCROLL_SPEED * lineHeight) / scrollContainer->getContentSize().y);
 	}
 	
 	if(lineEnd == -1) {

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,10 @@ Number UIScrollContainer::getVScrollWidth() {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
	`118`	`+UIVScrollBar *UIScrollContainer::getVScrollBar() { return vScrollBar; }`
	`119`	`+`
	`120`	`+UIHScrollBar *UIScrollContainer::getHScrollBar() { return hScrollBar; }`
	`121`	`+`
`118`	`122`	`void UIScrollContainer::setContentSize(Number newContentWidth, Number newContentHeight) {`
`119`	`123`
`120`	`124`	`if(newContentWidth < 1.0)`
Original file line number	Diff line number	Diff line change
`@@ -2396,7 +2396,7 @@ void UITextInput::updateWordWrap(int lineStart, int lineEnd) {`
`2396`	`2396`	`void UITextInput::readjustBuffer(int lineStart, int lineEnd) {`
`2397`	`2397`
`2398`	`2398`	`if(scrollContainer) {`
`2399`		`- scrollContainer->getVScrollBar()->setTickSize((UI_TEXT_INPUT_SCROLL_SPEED * lineHeight) /scrollContainer->getContentSize().y);`
	`2399`	`+ scrollContainer->getVScrollBar()->setTickSize((UI_TEXT_INPUT_SCROLL_SPEED * lineHeight) / scrollContainer->getContentSize().y);`
`2400`	`2400`	`}`
`2401`	`2401`
`2402`	`2402`	`if(lineEnd == -1) {`