Changeset 755Tweet

Timestamp:

Apr 4, 2011, 2:05:59 AM (10 years ago)

Author:

sam

Message:

video: get rid of Video::GetWidth() and Video::GetHeight().

Location:

trunk

Files:

• deushax/gtk/glmapview.cpp (modified) (1 diff)
• src/debugrecord.cpp (modified) (5 diffs)
• src/eglapp.cpp (modified) (1 diff)
• src/sdlapp.cpp (modified) (1 diff)
• src/sdlinput.cpp (modified) (1 diff)
• src/video.cpp (modified) (8 diffs)
• src/video.h (modified) (2 diffs)

trunk/deushax/gtk/glmapview.cpp

@@ -127 +127 @@
     {
         Ticker::Setup(FPS);
-        Video::Setup(glarea->allocation.width, glarea->allocation.height);
+        Video::Setup(vec2i(glarea->allocation.width,
+                           glarea->allocation.height));
     }
 

trunk/src/debugrecord.cpp

@@ -35 +35 @@
 private:
     char const *path;
-    int width, height, fps;
+    vec2i size;
+    int fps;
 #if defined USE_PIPI
     pipi_sequence_t *sequence;
@@ -51 +52 @@
 
     data->path = strdup(path);
-    data->width = 0;
-    data->height = 0;
+    data->size = 0;
     data->fps = (int)(fps + 0.5f);
 #if defined USE_PIPI
@@ -70 +70 @@
     Entity::TickDraw(deltams);
 
-    int width = Video::GetWidth();
-    int height = Video::GetHeight();
+    vec2i size = Video::GetSize();
 
-    if (data->width != width || data->height != height)
+    if (data->size != size)
     {
-        data->width = width;
-        data->height = height;
+        data->size = size;
 
 #if defined USE_PIPI
@@ -82 +80 @@
             pipi_close_sequence(data->sequence);
 
-        data->sequence = pipi_open_sequence(data->path, width, height,
+        data->sequence = pipi_open_sequence(data->path, size.x, size.y,
                                             1 /* RGB */, data->fps,
                                             1, 1, 60 * 1024 * 1024);
@@ -91 +89 @@
     if (data->sequence)
     {
-        uint32_t *buffer = new uint32_t[width * height];
+        uint32_t *buffer = new uint32_t[size.x * size.y];
         Video::Capture(buffer);
-        pipi_feed_sequence(data->sequence, (uint8_t *)buffer, width, height);
+        pipi_feed_sequence(data->sequence, (uint8_t *)buffer, size.x, size.y);
         delete[] buffer;
     }

trunk/src/eglapp.cpp

@@ -150 +150 @@
     /* Initialise everything */
     Ticker::Setup(fps);
-    Video::Setup(gwa.width, gwa.height);
+    Video::Setup(vec2i(gwa.width, gwa.height));
     Audio::Setup(2);
 #endif

trunk/src/sdlapp.cpp

@@ -65 +65 @@
     /* Initialise everything */
     Ticker::Setup(fps);
-    Video::Setup(video->w, video->h);
+    Video::Setup(vec2i(video->w, video->h));
     Audio::Setup(2);
 #endif

trunk/src/sdlinput.cpp

@@ -56 +56 @@
     {
         SDL_GetMouseState(&mouse.x, &mouse.y);
-        mouse.y = Video::GetHeight() - 1 - mouse.y;
+        mouse.y = Video::GetSize().y - 1 - mouse.y;
     }
     else

trunk/src/video.cpp

@@ -97 +97 @@
     "    float t3 = mod(3.0 * dx3 + 2.0 * dy3, 4.0);\n"
     "    float t1 = (1.0 + 16.0 * t1 + 4.0 * t2 + t3) / 65.0;\n"
-    "    float t2 = t1;
-    "    float t3 = t1;
+    "    float t2 = t1;\n"
+    "    float t3 = t1;\n"
 #else
     "    float rand = sin(gl_FragCoord.x * 1.23456) * 123.456\n"
@@ -123 +123 @@
  */
 
-void Video::Setup(int width, int height)
+void Video::Setup(vec2i size)
 {
     /* Initialise OpenGL */
-    glViewport(0, 0, width, height);
-
-#if defined ANDROID_NDK
-    saved_viewport = vec2i(width, height);
+    glViewport(0, 0, size.x, size.y);
+
+#if defined ANDROID_NDK
+    saved_viewport = vec2i(size.x, size.y);
 #endif
 
@@ -149 +149 @@
     mat4 proj;
 
-    float width = GetWidth();
-    float height = GetHeight();
-    float near = -width - height;
-    float far = width + height;
-
-#if defined ANDROID_NDK
-    width = 640.0f;
-    height = 480.0f;
+    vec2 size = GetSize();
+    float near = -size.x - size.y;
+    float far = size.x + size.y;
+
+#if defined ANDROID_NDK
+    size = vec(640.0f, 480.0f);
 #endif
 
@@ -163 +161 @@
     {
         /* The easy way: purely orthogonal projection. */
-        proj_matrix = mat4::ortho(0, width, 0, height, near, far);
+        proj_matrix = mat4::ortho(0, size.x, 0, size.y, near, far);
     }
     else
@@ -171 +169 @@
          * the screen. */
         float t1 = tanf(theta / 2);
-        float t2 = t1 * height / width;
-        float dist = (float)width / (2.0f * t1);
+        float t2 = t1 * size.y / size.y;
+        float dist = size.x / (2.0f * t1);
 
         near += dist;
@@ -185 +183 @@
         proj_matrix = mat4::frustum(-near * t1, near * t1,
                                     -near * t2, near * t2, near, far)
-                    * mat4::translate(-0.5f * width, -0.5f * height, -dist);
+                    * mat4::translate(-0.5f * size.x, -0.5f * size.y, -dist);
     }
 
@@ -208 +206 @@
 void Video::Clear()
 {
-    glViewport(0, 0, GetWidth(), GetHeight());
+    vec2i size = GetSize();
+    glViewport(0, 0, size.x, size.y);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
@@ -256 +255 @@
 }
 
-int Video::GetWidth()
-{
-    return GetSize().x;
-}
-
-int Video::GetHeight()
-{
-    return GetSize().y;
-}
-
 } /* namespace lol */
 

trunk/src/video.h

@@ -26 +26 @@
 {
 public:
-    static void Setup(int width, int height);
+    static void Setup(vec2i size);
     static void Destroy();
     static void SetFov(float theta);
@@ -33 +33 @@
     static void Capture(uint32_t *buffer);
     static vec2i GetSize();
-    static int GetWidth();
-    static int GetHeight();
 };