Solved ordering issues

actions.cpp

@@ -16,7 +16,7 @@ DoActionTag::DoActionTag(RECORDHEADER h, std::istream& in):DisplayListTag(h,in)
 	}
 }
 
-UI16 DoActionTag::getDepth()
+UI16 DoActionTag::getDepth() const
 {
 	return 0;
 }

actions.h

@@ -16,7 +16,7 @@ class DoActionTag: public DisplayListTag
 public:
 	DoActionTag(RECORDHEADER h, std::istream& in);
 	void Render( );
-	UI16 getDepth();
+	UI16 getDepth() const;
 	void printInfo(int t=0);
 };
 

frame.cpp

@@ -6,7 +6,7 @@
 
 using namespace std;
 
-void Frame::Render()
+void Frame::Render(int baseLayer)
 {
 	cout << "Start Frame" << endl << endl;
 	list < DisplayListTag* >::iterator i=displayList.begin();

frame.h

@@ -10,12 +10,11 @@ class Frame
 {
 private:
 	STRING Label;
-	int baseLayer;
 public:
 	std::list<DisplayListTag*> displayList;
 
 	Frame(const std::list<DisplayListTag*>& d):displayList(d),hack(0){ }
-	void Render();
+	void Render(int baseLayer);
 	void setLabel(STRING l);
 
 	int hack;

main.cpp

@@ -82,9 +82,9 @@ int main()
 
 			//if(sys.clip.state.FP>=43)
 			//	sys.clip.frames[sys.clip.state.FP].hack=1;
-			sys.clip.frames[sys.clip.state.FP].Render();
+			sys.clip.frames[sys.clip.state.FP].Render(0);
 
-			if(1)
+			if(0)
 			{
 
 			glReadPixels(0,240,640,240,GL_DEPTH_COMPONENT,GL_FLOAT,buffer);

swf.cpp

@@ -40,6 +40,11 @@ SystemState::SystemState():currentDisplayList(&clip.displayList),currentState(&c
 	sem_init(&sem_run,0,0);
 }
 
+bool list_orderer(const DisplayListTag* a, int d)
+{
+	return a->getDepth()<d;
+}
+
 void* ParseThread::worker(void* in_ptr)
 {
 	ifstream& f=*(ifstream*)in_ptr;
@@ -67,7 +72,13 @@ void* ParseThread::worker(void* in_ptr)
 					break;
 				case DISPLAY_LIST_TAG:
 					if(dynamic_cast<DisplayListTag*>(tag)->add_to_list)
-						sys.clip.displayList.push_back(dynamic_cast<DisplayListTag*>(tag));
+					{
+						list<DisplayListTag*>::iterator it=lower_bound(sys.clip.displayList.begin(),
+								sys.clip.displayList.end(),
+								dynamic_cast<DisplayListTag*>(tag)->getDepth(),
+								list_orderer);
+						sys.clip.displayList.insert(it,dynamic_cast<DisplayListTag*>(tag));
+					}
 					break;
 				case SHOW_TAG:
 				{

swftypes.h

@@ -24,8 +24,8 @@ class UI16
 public:
 	UI16():val(0){}
 	UI16(uint16_t v):val(v){}
-	operator uint16_t(){ return val; }
-	operator UI32(){ return val; }
+	operator uint16_t() const { return val; }
+	operator UI32() const { return val; }
 };
 
 class UI8

tags.cpp

@@ -96,6 +96,8 @@ SetBackgroundColorTag::SetBackgroundColorTag(RECORDHEADER h, std::istream& in):C
 //	std::cout << BackgroundColor << std::endl;
 }
 
+bool list_orderer(const DisplayListTag* a, int d);
+
 DefineSpriteTag::DefineSpriteTag(RECORDHEADER h, std::istream& in):RenderTag(h,in)
 {
 	list < DisplayListTag* >* bak=sys.currentDisplayList;
@@ -115,7 +117,13 @@ DefineSpriteTag::DefineSpriteTag(RECORDHEADER h, std::istream& in):RenderTag(h,i
 				throw "Sprite Render";
 			case DISPLAY_LIST_TAG:
 				if(dynamic_cast<DisplayListTag*>(tag)->add_to_list)
-					clip.displayList.push_back(dynamic_cast<DisplayListTag*>(tag));
+				{
+						list<DisplayListTag*>::iterator it=lower_bound(clip.displayList.begin(),
+								clip.displayList.end(),
+								dynamic_cast<DisplayListTag*>(tag)->getDepth(),
+								list_orderer);
+						clip.displayList.insert(it,dynamic_cast<DisplayListTag*>(tag));
+				}
 				break;
 			case SHOW_TAG:
 			{
@@ -196,17 +204,18 @@ void DefineSpriteTag::Render(int layer)
 	sys.currentState=&clip.state;
 	std::cout << "==> Render Sprite" << std::endl;
 	clip.state.next_FP=min(clip.state.FP+1,clip.frames.size()-1);
-	clip.state.next_FP=min(clip.state.next_FP,4);
+//	clip.state.next_FP=min(clip.state.next_FP,4);
 
 	list<DisplayListTag*>::iterator it=clip.frames[clip.state.FP].displayList.begin();
-	cerr << "Inizio DEBUG frame " << clip.state.FP << endl;
+	cerr << "Inizio DEBUG frame " << clip.state.FP << " layer " << layer << endl;
 	for(it;it!=clip.frames[clip.state.FP].displayList.end();it++)
 	{
 		(*it)->printInfo(1);
+		cerr << "Depth " << (*it)->getDepth() << endl;
 	}
 	cerr << "Fine DEBUG" << endl;
 
-	clip.frames[clip.state.FP].Render();
+	clip.frames[clip.state.FP].Render(layer);
 //	clip.frames.back().hack=layer;
 //	clip.frames.back().Render();
 

tags.h

@@ -44,7 +44,7 @@ class DisplayListTag: public Tag
 	bool add_to_list;
 	DisplayListTag(RECORDHEADER h, std::istream& s):Tag(h,s),add_to_list(true){}
 	virtual TAGTYPE getType(){ return DISPLAY_LIST_TAG; }
-	virtual UI16 getDepth()=0;
+	virtual UI16 getDepth() const=0;
 	virtual void Render()=0;
 };
 
@@ -178,7 +178,7 @@ class PlaceObject2Tag: public DisplayListTag
 public:
 	PlaceObject2Tag(RECORDHEADER h, std::istream& in);
 	void Render( );
-	UI16 getDepth()
+	UI16 getDepth() const
 	{
 		return Depth;
 	}
@@ -193,7 +193,7 @@ class FrameLabelTag: public DisplayListTag
 public:
 	FrameLabelTag(RECORDHEADER h, std::istream& in);
 	void Render( );
-	UI16 getDepth()
+	UI16 getDepth() const
 	{
 		return 0;
 	}