Changeset 289 for trunk/deushaxTweet

Timestamp:

Jan 26, 2011, 1:33:36 AM (12 years ago)

Author:

sam

Message:

Change the way the Scene object works.

Location:

trunk/deushax

Files:

• debugsprite.cpp (modified) (1 diff)
• game.cpp (modified) (4 diffs)
• game.h (modified) (2 diffs)
• mapviewer.cpp (modified) (3 diffs)
• mapviewer.h (modified) (1 diff)

trunk/deushax/debugsprite.cpp

@@ -61 +61 @@
     int z = data->z;
 
-    data->game->GetScene()->AddTile((data->tiler << 16) | 31,
-                                    x - 16, y, z, 1);
-    data->game->GetScene()->AddTile((data->tiler << 16) | 15,
-                                    x - 16, y, z + 32, 1);
+    Scene::GetDefault()->AddTile((data->tiler << 16) | 31,
+                                 x - 16, y, z, 1);
+    Scene::GetDefault()->AddTile((data->tiler << 16) | 15,
+                                 x - 16, y, z + 32, 1);
 }
 

trunk/deushax/game.cpp

@@ -26 +26 @@
     int mousex, mousey;
     int done;
-
-    Scene *scene;
 };
 
@@ -40 +38 @@
     data->x = data->y = 0;
     data->done = 0;
-    data->scene = NULL;
 }
 
@@ -58 +55 @@
     Entity::TickDraw(deltams);
 
-    GetScene();
-
-    data->map->Render(data->scene, -data->mousex, -data->mousey, 0);
-    data->scene->Render();
-
-    delete data->scene;
-    data->scene = NULL;
+    data->map->Render(-data->mousex, -data->mousey, 0);
 }
 
+#if 0
 Scene *Game::GetScene()
 {
@@ -73 +65 @@
     return data->scene;
 }
+#endif
 
 void Game::SetMouse(int x, int y)

trunk/deushax/game.h

@@ -13 +13 @@
 
 #include "entity.h"
-#include "scene.h"
 
 class GameData;
@@ -30 +29 @@
 public:
     /* New methods */
-    Scene *GetScene();
     void SetMouse(int x, int y);
     void Quit();

trunk/deushax/mapviewer.cpp

@@ -26 +26 @@
     int povx, povy;
     int done;
-
-    Scene *scene;
 };
 
@@ -40 +38 @@
     data->x = data->y = 0;
     data->done = 0;
-    data->scene = NULL;
 }
 
@@ -58 +55 @@
     Entity::TickDraw(deltams);
 
-    GetScene();
-
-    data->map->Render(data->scene, -data->povx, -data->povy, 0);
-    data->scene->Render();
-
-    delete data->scene;
-    data->scene = NULL;
-}
-
-Scene *MapViewer::GetScene()
-{
-    if (!data->scene)
-        data->scene = new Scene(45.0f);
-    return data->scene;
+    data->map->Render(-data->povx, -data->povy, 0);
 }
 

trunk/deushax/mapviewer.h

@@ -13 +13 @@
 
 #include "entity.h"
-#include "scene.h"
 
 class MapViewerData;