Changeset 1229Tweet

Timestamp:

Apr 15, 2012, 1:27:45 AM (11 years ago)

Author:

sam

Message:

build: minor Windows compilation fixes.

Location:

trunk

Files:

• deushax/deushax.cpp (modified) (1 diff)
• src/gradient.cpp (modified) (2 diffs)
• test/tutorial/tut03.cpp (modified) (6 diffs)

trunk/deushax/deushax.cpp

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

trunk/src/gradient.cpp

@@ -15 +15 @@
 #include <cmath>
 
+#ifdef WIN32
+#   define WIN32_LEAN_AND_MEAN
+#   include <windows.h>
+#   if defined USE_D3D9
+#       include <algorithm>
+        using std::min;
+        using std::max;
+#       include <d3d9.h>
+#       include <d3dx9shader.h>
+#   endif
+#endif
+
 #include "core.h"
 #include "lolgl.h"
 
 using namespace std;
+
+#if defined USE_D3D9
+extern IDirect3DDevice9 *g_d3ddevice;
+#elif defined _XBOX
+extern D3DDevice *g_d3ddevice;
+#endif
 
 namespace lol
@@ -204 +222 @@
 
     /* Draw arrays */
+#if defined _XBOX || defined USE_D3D9
+    g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, 2);
+#else
     glDrawArrays(GL_TRIANGLES, 0, 6);
+#endif
 }
 

trunk/test/tutorial/tut03.cpp

@@ -428 +428 @@
     virtual void TickDraw(float deltams)
     {
-Log::Error("Tick Fractal\n");
         WorldEntity::TickDraw(deltams);
 
@@ -608 +607 @@
                 "}"
 #else
-                "void main(float4 a_Vertex : POSITION,"
+                "void main(float2 a_Vertex : POSITION,"
                 "          float2 a_TexCoord : TEXCOORD0,"
                 "          uniform float4x4 u_ZoomSettings,"
@@ -619 +618 @@
                 "          out float4 v_IndexY : TEXCOORD3)"
                 "{"
-                "    out_Position = a_Vertex;"
+                "    out_Position = float4(a_Vertex, 0.0, 1.0);"
                 "    float4 offsets = float4(0.5, -0.5, 0.015625, -0.015625);"
                 "    float4 zoomscale = float4(u_ZoomSettings[2][0],"
@@ -746 +745 @@
 #if defined _XBOX || defined USE_D3D9
         g_d3ddevice->SetTexture(0, m_tex);
-        //g_d3ddevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW);
-        g_d3ddevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
+        g_d3ddevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW);
 #elif !defined __CELLOS_LV2__ && !defined __ANDROID__
 #else
@@ -757 +755 @@
 
 #if defined _XBOX || defined USE_D3D9
-        /* FIXME: what the fuck? Why does "2" not work here instead of 3? */
-        g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, 3);
+        g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, 2);
 #else
         glDrawArrays(GL_TRIANGLES, 0, 6);
@@ -778 +775 @@
         //glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 #endif
-Log::Error("~Tick Fractal\n");
     }