Changeset 615Tweet

Timestamp:

Feb 8, 2011, 11:28:29 PM (11 years ago)

Author:

sam

Message:

Allow to specify FPS in the DebugRecord object.

Location:

trunk

Files:

• deushax/deushax.cpp (modified) (1 diff)
• monsterz/monsterz.cpp (modified) (2 diffs)
• src/debugrecord.cpp (modified) (4 diffs)
• src/debugrecord.h (modified) (1 diff)
• src/video.cpp (modified) (1 diff)

trunk/deushax/deushax.cpp

@@ -65 +65 @@
     new DebugSprite(game);
     new DebugSphere();
-    //new DebugRecord("lolengine.ogg");
+    //new DebugRecord("lolengine.ogm", FPS);
     new DebugStats("stats.txt");
 

trunk/monsterz/monsterz.cpp

@@ -26 +26 @@
 
 #include "debugfps.h"
+#include "debugrecord.h"
 
 static float const FPS = 60.0f;
@@ -64 +65 @@
     new Interface();
     new DebugFps(20, 20);
+    //new DebugRecord("monsterz.ogm", FPS);
 
     while (!Ticker::Finished())

trunk/src/debugrecord.cpp

@@ -33 +33 @@
 private:
     char const *path;
-    int width, height;
+    int width, height, fps;
 #if defined USE_PIPI
     pipi_sequence_t *sequence;
@@ -43 +43 @@
  */
 
-DebugRecord::DebugRecord(char const *path)
+DebugRecord::DebugRecord(char const *path, float fps)
   : data(new DebugRecordData())
 {
@@ -49 +49 @@
     data->width = 0;
     data->height = 0;
+    data->fps = (int)(fps + 0.5f);
 #if defined USE_PIPI
     data->sequence = NULL;
@@ -77 +78 @@
             pipi_close_sequence(data->sequence);
 
-        data->sequence = pipi_open_sequence(data->path, width, height, 30);
+        data->sequence = pipi_open_sequence(data->path, width, height,
+                                            1 /* RGB */, data->fps,
+                                            1, 1, 60 * 1024 * 1024);
 #endif
     }

trunk/src/debugrecord.h

@@ -24 +24 @@
 {
 public:
-    DebugRecord(char const *path);
+    DebugRecord(char const *path, float fps);
     virtual ~DebugRecord();
 

trunk/src/video.cpp

@@ -121 +121 @@
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
 
+#if defined GL_BGRA
+    glReadPixels(0, 0, width, height, GL_BGRA, GL_UNSIGNED_BYTE, buffer);
+#else
     glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+#endif
 
     for (int j = 0; j < height / 2; j++)