[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldmap drawable.hxx,1.6,1.7 level_d
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldmap drawable.hxx,1.6,1.7 level_dot.cxx,1.17,1.18 level_dot.hxx,1.8,1.9 manager.cxx,1.34,1.35 path_drawable.cxx,1.6,1.7 path_drawable.hxx,1.3,1.4 pingus.cxx,1.29,1.30 pingus.hxx,1.24,1.25 sprite_drawable.hxx,1.1,1.2 surface_drawable.cxx,1.4,1.5 surface_drawable.hxx,1.3,1.4 worldmap.cxx,1.43,1.44worldmap.hxx,1.26,1.27 |
Date: |
10 Apr 2003 11:51:34 -0000 |
Update of /var/lib/cvs/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv11708/worldmap
Modified Files:
drawable.hxx level_dot.cxx level_dot.hxx manager.cxx
path_drawable.cxx path_drawable.hxx pingus.cxx pingus.hxx
sprite_drawable.hxx surface_drawable.cxx surface_drawable.hxx
worldmap.cxx worldmap.hxx
Log Message:
made worldmap CPU independent
Index: drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/drawable.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- drawable.hxx 20 Oct 2002 18:28:49 -0000 1.6
+++ drawable.hxx 10 Apr 2003 11:51:32 -0000 1.7
@@ -66,7 +66,7 @@
std::string get_name() { return name; }
virtual void draw(GraphicContext& gc) =0;
- virtual void update() =0;
+ virtual void update(float delta) =0;
virtual float get_z_pos() const =0;
Index: level_dot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/level_dot.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- level_dot.cxx 9 Apr 2003 21:57:24 -0000 1.17
+++ level_dot.cxx 10 Apr 2003 11:51:32 -0000 1.18
@@ -93,8 +93,9 @@
}
void
-LevelDot::update()
+LevelDot::update(float delta)
{
+ UNUSED_ARG(delta);
}
void
Index: level_dot.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/level_dot.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- level_dot.hxx 9 Apr 2003 21:57:24 -0000 1.8
+++ level_dot.hxx 10 Apr 2003 11:51:32 -0000 1.9
@@ -45,7 +45,7 @@
void draw(GraphicContext& gc);
void draw_hover(GraphicContext& gc);
- void update();
+ void update(float delta);
PLFHandle get_plf () const { return plf; }
void on_click();
Index: manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- manager.cxx 6 Apr 2003 12:40:47 -0000 1.34
+++ manager.cxx 10 Apr 2003 11:51:32 -0000 1.35
@@ -267,8 +267,10 @@
}
void
-WorldMapManager::update (float)
+WorldMapManager::update (float delta)
{
+ UNUSED_ARG(delta);
+
// Exit the word
if (exit_worldmap)
ScreenManager::instance ()->pop_screen ();
@@ -291,7 +293,7 @@
void
WorldMapManager::WorldMapComponent::update (float delta)
{
- WorldMapManager::instance()->worldmap->update();
+ WorldMapManager::instance()->worldmap->update(delta);
UNUSED_ARG(delta);
}
Index: path_drawable.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/path_drawable.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- path_drawable.cxx 19 Feb 2003 09:50:36 -0000 1.6
+++ path_drawable.cxx 10 Apr 2003 11:51:32 -0000 1.7
@@ -42,8 +42,9 @@
}
void
-PathDrawable::update ()
+PathDrawable::update (float delta)
{
+ UNUSED_ARG(delta);
}
} // namespace WorldMapNS
Index: path_drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/path_drawable.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- path_drawable.hxx 3 Nov 2002 23:31:35 -0000 1.3
+++ path_drawable.hxx 10 Apr 2003 11:51:32 -0000 1.4
@@ -35,7 +35,7 @@
PathDrawable(const Path& arg_path);
void draw(GraphicContext& gc);
- void update();
+ void update(float delta);
float get_z_pos() const { return 10000; }
private:
Index: pingus.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/pingus.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pingus.cxx 27 Mar 2003 16:42:30 -0000 1.29
+++ pingus.cxx 10 Apr 2003 11:51:32 -0000 1.30
@@ -70,11 +70,9 @@
}
void
-Pingus::update ()
+Pingus::update (float delta)
{
- float delta = 0.025f;
-
- sprite.update ();
+ sprite.update (delta);
if (is_walking())
update_walk(delta);
}
@@ -82,7 +80,7 @@
void
Pingus::update_walk (float delta)
{
- float velocity = 50.0f;
+ float velocity = 70.0f;
//std::cout << "Updating Walk: " << edge_path_position << "/" <<
edge_path_length << std::endl;
// Update the edge_path_position
Index: pingus.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/pingus.hxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pingus.hxx 27 Mar 2003 16:42:30 -0000 1.24
+++ pingus.hxx 10 Apr 2003 11:51:32 -0000 1.25
@@ -84,7 +84,7 @@
~Pingus ();
void draw (GraphicContext& gc);
- void update ();
+ void update (float delta);
/** @return true if the node is reachable, false otherwise */
bool walk_to_node (NodeId target);
Index: sprite_drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/sprite_drawable.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sprite_drawable.hxx 12 Oct 2002 23:37:23 -0000 1.1
+++ sprite_drawable.hxx 10 Apr 2003 11:51:32 -0000 1.2
@@ -39,9 +39,9 @@
void draw(GraphicContext& gc);
- void update()
+ void update(float delta)
{
- sprite.update();
+ sprite.update(delta);
}
private:
Index: surface_drawable.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/surface_drawable.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- surface_drawable.cxx 1 Apr 2003 16:00:08 -0000 1.4
+++ surface_drawable.cxx 10 Apr 2003 11:51:32 -0000 1.5
@@ -45,9 +45,9 @@
}
void
-SurfaceDrawable::update()
+SurfaceDrawable::update(float delta)
{
-
+ UNUSED_ARG(delta);
}
void
Index: surface_drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/surface_drawable.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_drawable.hxx 7 Mar 2003 00:09:00 -0000 1.3
+++ surface_drawable.hxx 10 Apr 2003 11:51:32 -0000 1.4
@@ -39,7 +39,7 @@
public:
SurfaceDrawable(xmlDocPtr doc, xmlNodePtr cur);
- void update();
+ void update(float delta);
void draw(GraphicContext&);
float get_z_pos() const { return pos.z; }
Index: worldmap.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- worldmap.cxx 6 Apr 2003 20:45:13 -0000 1.43
+++ worldmap.cxx 10 Apr 2003 11:51:32 -0000 1.44
@@ -256,11 +256,11 @@
}
void
-WorldMap::update ()
+WorldMap::update (float delta)
{
for (DrawableLst::iterator i = drawables.begin (); i != drawables.end ();
++i)
{
- (*i)->update ();
+ (*i)->update (delta);
}
}
Index: worldmap.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.hxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- worldmap.hxx 6 Apr 2003 12:40:47 -0000 1.26
+++ worldmap.hxx 10 Apr 2003 11:51:32 -0000 1.27
@@ -88,7 +88,7 @@
void on_startup();
void draw (GraphicContext& gc);
- void update ();
+ void update (float delta);
/** Enters the level on which the Pingu is currently standing */
void enter_level();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldmap drawable.hxx,1.6,1.7 level_dot.cxx,1.17,1.18 level_dot.hxx,1.8,1.9 manager.cxx,1.34,1.35 path_drawable.cxx,1.6,1.7 path_drawable.hxx,1.3,1.4 pingus.cxx,1.29,1.30 pingus.hxx,1.24,1.25 sprite_drawable.hxx,1.1,1.2 surface_drawable.cxx,1.4,1.5 surface_drawable.hxx,1.3,1.4 worldmap.cxx,1.43,1.44worldmap.hxx,1.26,1.27,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src credits.cxx,1.19,1.20 globals.cxx,1.8,1.9
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.69,1.70
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src credits.cxx,1.19,1.20 globals.cxx,1.8,1.9
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.69,1.70
- Index(es):