dunelegacy-commit Mailing List for Dune Legacy (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 176
          http://dunelegacy.svn.sourceforge.net/dunelegacy/?rev=176&view=rev
Author:   dvalin
Date:     2008-04-28 11:00:53 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
add support for animations (merged from richies branch)

Modified Paths:
--------------
    branches/dunks/include/pakfile/Wsafile.h
    branches/dunks/src/pakfile/Wsafile.cpp

Added Paths:
-----------
    branches/dunks/include/pakfile/Animation.h
    branches/dunks/src/pakfile/Animation.cpp

Added: branches/dunks/include/pakfile/Animation.h
===================================================================

--- branches/dunks/include/pakfile/Animation.h	                        (rev 0)
+++ branches/dunks/include/pakfile/Animation.h	2008-04-28 18:00:53 UTC (rev 176)
@@ -0,0 +1,33 @@
+#ifndef ANIMATION_H_INCLUDED
+#define ANIMATION_H_INCLUDED
+
+#include <SDL.h>
+#include "Gfx.h"
+
+class Animation
+{
+public:
+	Animation();
+	~Animation();
+	
+	Image * getFrame();
+	void setFrameRate(double FrameRate) {
+		if(FrameRate == 0.0) {
+			FrameDurationTime = 1;
+		} else {
+			FrameDurationTime = (int) (1000.0/FrameRate);
+		}
+	}
+	
+	void addFrame(Image * newFrame, bool SetColorKey = false);
+
+private:
+	Uint32 CurFrameStartTime;
+	Uint32 FrameDurationTime;
+	int curFrame;
+	int NumFrames;
+	Image ** Frame;
+};
+
+#endif // ANIMATION_H_INCLUDED
+


Property changes on: branches/dunks/include/pakfile/Animation.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/dunks/include/pakfile/Wsafile.h
===================================================================
--- branches/dunks/include/pakfile/Wsafile.h	2008-04-28 00:38:26 UTC (rev 175)
+++ branches/dunks/include/pakfile/Wsafile.h	2008-04-28 18:00:53 UTC (rev 176)
@@ -3,6 +3,7 @@
 
 #include "Gfx.h"
 #include "pakfile/Decode.h"
+#include "pakfile/Animation.h"
 #include "SDL.h"
 
 #include <boost/shared_ptr.hpp>
@@ -20,6 +21,8 @@
 
 	Image * getPicture(Uint32 FrameNumber, SDL_Palette *palette);
 
+	Animation* getAnimation(unsigned int startindex, unsigned int endindex, SDL_Palette *palette, bool SetColorKey=true);
+
 	inline int getNumFrames() { return (int) NumFrames; };
 	inline Uint32 getFramesPer1024ms() { return FramesPer1024ms; };
     inline float getFPS() { return fps; }

Added: branches/dunks/src/pakfile/Animation.cpp
===================================================================
--- branches/dunks/src/pakfile/Animation.cpp	                        (rev 0)
+++ branches/dunks/src/pakfile/Animation.cpp	2008-04-28 18:00:53 UTC (rev 176)
@@ -0,0 +1,49 @@
+#include "pakfile/Animation.h"
+#include <stdio.h>
+#include <stdlib.h>
+Animation::Animation() {
+	CurFrameStartTime = SDL_GetTicks();
+	FrameDurationTime = 1;
+	NumFrames = 0;
+	curFrame = 0;
+	Frame = NULL;
+}
+
+Animation::~Animation() {
+	if(Frame != NULL) {
+		for(int i=0; i < NumFrames; i++) {
+			SDL_FreeSurface(Frame[i]->getSurface());
+//			Frame[i] = NULL;
+		}
+		free(Frame);
+	}
+}
+
+Image *  Animation::getFrame() {
+	if(Frame == NULL) {
+		return NULL;
+	}
+	
+	if((SDL_GetTicks() - CurFrameStartTime) > FrameDurationTime) {
+		CurFrameStartTime = SDL_GetTicks();
+		curFrame++;
+		if(curFrame >= NumFrames) {
+			curFrame = 0;
+		}
+	}
+	return Frame[curFrame];
+}
+
+void Animation::addFrame(Image * newFrame, bool SetColorKey) {
+	if((Frame = (Image **) realloc(Frame,sizeof(Image *) * (NumFrames+1))) == NULL) {
+		perror("Animation::addFrame()");
+		exit(EXIT_FAILURE);
+	}
+	
+		Frame[NumFrames] = newFrame;
+	
+	if(SetColorKey == true) {
+		SDL_SetColorKey((Frame[NumFrames])->getSurface(), SDL_SRCCOLORKEY | SDL_RLEACCEL, 0);
+	}
+	NumFrames++;
+}


Property changes on: branches/dunks/src/pakfile/Animation.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/dunks/src/pakfile/Wsafile.cpp
===================================================================
--- branches/dunks/src/pakfile/Wsafile.cpp	2008-04-28 00:38:26 UTC (rev 175)
+++ branches/dunks/src/pakfile/Wsafile.cpp	2008-04-28 18:00:53 UTC (rev 176)
@@ -110,6 +110,36 @@
 
 }
 
+/// Returns an animation
+/**
+	This method returns a new animation object with all pictures from startindex to endindex
+	in it. The returned pointer should be freed with delete if no longer needed. If an error
+	occured, NULL is returned.
+	\param	startindex	index of the first picture
+	\param	endindex	index of the last picture
+	\param	DoublePic	if true, the picture is scaled up by a factor of 2
+	\param	SetColorKey	if true, black is set as transparency
+	\return	a new animation object or NULL on error
+*/
+Animation* Wsafile::getAnimation(unsigned int startindex, unsigned int endindex, SDL_Palette *palette, bool SetColorKey)
+{
+	Animation* tmpAnimation;
+	Image* tmp;
+	
+	if((tmpAnimation = new Animation()) == NULL) {
+		return NULL;
+	}
+	
+	for(unsigned int i = startindex; i <= endindex; i++) {
+		if((tmp = getPicture(i, palette)) == NULL) {
+			delete tmpAnimation;
+			return NULL;
+		}
+		tmpAnimation->addFrame(tmp,SetColorKey);
+	}
+	return tmpAnimation;
+}
+
 void Wsafile::decodeFrames()
 {
 	unsigned char *dec80;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul (44)	Aug (36)	Sep (5)	Oct	Nov (6)	Dec (2)
2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec (1)
2008	Jan	Feb	Mar	Apr (87)	May (54)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

dunelegacy-commit Mailing List for Dune Legacy (Page 5)

dunelegacy-commit — commit log