Fixed a lot o compile errors in Altona

farbrausch · May 5, 2012 · c8ff39c · c8ff39c
1 parent 6d80581
commit c8ff39c
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 541 deletions.
diff --git a/altona_wz4/altona/examples/_dx11/gs_wireframe/main.cpp b/altona_wz4/altona/examples/_dx11/gs_wireframe/main.cpp
@@ -137,9 +137,9 @@ void MyApp::OnPaint3D()
 
 // onkey: check for escape
 
-void MyApp::OnInput(const sInputEvent &ie)
+void MyApp::OnInput(const sInput2Event &ie)
 {
-  if(ie.DeviceType==sIED_KEYBOARD && (ie.Key&sKEYQ_MASK)==sKEY_ESCAPE) sExit();
+  if( (ie.Key&sKEYQ_MASK)==sKEY_ESCAPE) sExit();
 }
 
 /****************************************************************************/

diff --git a/altona_wz4/altona/examples/_dx11/gs_wireframe/main.hpp b/altona_wz4/altona/examples/_dx11/gs_wireframe/main.hpp
@@ -37,7 +37,7 @@ class MyApp : public sApp
   MyApp();
   ~MyApp();
   void OnPaint3D();
-  void OnInput(const sInputEvent &ie);
+  void OnInput(const sInput2Event &ie);
 };
 
 /****************************************************************************/
diff --git a/altona_wz4/altona/examples/_dx11/tesselate/main.cpp b/altona_wz4/altona/examples/_dx11/tesselate/main.cpp
@@ -138,9 +138,9 @@ void MyApp::OnPaint3D()
 
 // onkey: check for escape
 
-void MyApp::OnInput(const sInputEvent &ie)
+void MyApp::OnInput(const sInput2Event &ie)
 {
-  if(ie.DeviceType==sIED_KEYBOARD && (ie.Key&sKEYQ_MASK)==sKEY_ESCAPE) sExit();
+  if((ie.Key&sKEYQ_MASK)==sKEY_ESCAPE) sExit();
 }
 
 /****************************************************************************/

diff --git a/altona_wz4/altona/examples/_dx11/tesselate/main.hpp b/altona_wz4/altona/examples/_dx11/tesselate/main.hpp
@@ -37,7 +37,7 @@ class MyApp : public sApp
   MyApp();
   ~MyApp();
   void OnPaint3D();
-  void OnInput(const sInputEvent &ie);
+  void OnInput(const sInput2Event &ie);
 };
 
 /****************************************************************************/
diff --git a/altona_wz4/altona/examples/input/main.cpp b/altona_wz4/altona/examples/input/main.cpp
@@ -15,10 +15,6 @@
 #include "base/input2.hpp"
 #include "base/windows.hpp"
 #include "util/shaders.hpp"
-#if sCONFIG_SDK_TC3
-#include "consoles/system2.hpp"
-#include "consoles/input2.hpp"
-#endif
 
 /****************************************************************************/
 

diff --git a/altona_wz4/altona/examples/inputasync/inputasync.mp.txt b/altona_wz4/altona/examples/inputasync/inputasync.mp.txt
diff --git a/altona_wz4/altona/examples/inputasync/main.cpp b/altona_wz4/altona/examples/inputasync/main.cpp
diff --git a/altona_wz4/altona/examples/inputasync/main.hpp b/altona_wz4/altona/examples/inputasync/main.hpp
diff --git a/altona_wz4/altona/examples/intersect_perf/main.cpp b/altona_wz4/altona/examples/intersect_perf/main.cpp
@@ -58,7 +58,7 @@ void sMain()
   {
     ray.Start.x = rand.Float(4.0f);
     ray.Start.z = rand.Float(4.0f);
-    nHits2 += ray.HitBilinearPatch(dist,p00,p01,p10,p11) ? 1 : 0;
+    nHits2 += ray.HitBilinearPatch(dist,p00,p01,p10,p11,0,0) ? 1 : 0;
   }
   time2 = sGetTime() - time2;
 

diff --git a/altona_wz4/altona/examples/netserver/main.cpp b/altona_wz4/altona/examples/netserver/main.cpp
@@ -6,7 +6,7 @@
 /**************************************************************************+*/
 
 #include "main.hpp"
-#include "network/httpserver.hpp"
+#include "network/http.hpp"
 
 const sChar8 Stylesheet[] = 
   "body {"