X11 cursors, NaClPlatform replaced by Pepper

- ozEngine * Cursor: X11 cursor loader and data structure - client * NaClPlatform & OpenGL removed, replaced by ozEngine counterparts * oz::Cursor used for rendering cursors
ducakar · Apr 29, 2013 · 9ef5191 · 9ef5191
1 parent 3b8efd0
commit 9ef5191
Show file tree

Hide file tree

Showing 75 changed files with 558 additions and 846 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -15,7 +15,7 @@
     * new SpinLock class
     * ALSA and OSS back-ends for System::bell()
     * linear algebra classes added as primitives to streams, Log and JSON
-    * PFile class merged into File class
+    * PFile class merged into File class (VFS paths begin with '@')
 - ozDynamics: new rigid body dynamics library
     * collision
         + primitives: Box, Capsule, Polytope, Compound

diff --git a/build.sh b/build.sh
@@ -15,7 +15,7 @@
 
 buildType=Debug
 platforms=(
-  Linux-x86_64
+#   Linux-x86_64
   Linux-x86_64-Clang
 #   Linux-i686
 #   Linux-i686-Clang
@@ -28,7 +28,7 @@ platforms=(
 #   NaCl-i686
 #   NaCl-ARM
 #   PNaCl
-  Android14-i686
+#   Android14-i686
 #   Android14-ARM
 #   Android14-ARMv7a
 #   Android14-MIPS

diff --git a/src/builder/Builder.cc b/src/builder/Builder.cc
@@ -911,12 +911,12 @@ int Builder::main( int argc, char** argv )
     lingua.build();
   }
   if( doUI ) {
-    UI::buildCursors();
     UI::buildIcons();
     UI::copyScheme();
 
+    copyFiles( "@ui/cur", "ui/cur", "", false );
     copyFiles( "@ui/font", "ui/font", "ttf", false );
-    copyFiles( "@ui/icon", "ui/icon", "", true );
+    copyFiles( "@ui/icon", "ui/icon", "", false );
   }
   if( doShaders ) {
     copyFiles( "@glsl", "glsl", "glsl", false );

diff --git a/src/builder/Context.hh b/src/builder/Context.hh
@@ -24,8 +24,7 @@
 #pragma once
 
 #include <builder/common.hh>
-
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 struct FIBITMAP;
 

diff --git a/src/builder/UI.cc b/src/builder/UI.cc
@@ -51,60 +51,6 @@ const char* const UI::ICON_NAMES[] = {
   "arrow"
 };
 
-void UI::buildCursors()
-{
-  if( File( "@ui/cur" ).type() != File::DIRECTORY ) {
-    return;
-  }
-
-  Log::println( "Building mouse cursors {" );
-  Log::indent();
-
-  bool useS3TC = context.useS3TC;
-  context.useS3TC = false;
-
-  File::mkdir( "ui" );
-  File::mkdir( "ui/cur" );
-
-  for( int i = 0; i < ui::Mouse::CURSORS_MAX; ++i ) {
-    File inFile( String::str( "@ui/cur/%s.in", ui::Mouse::NAMES[i] ) );
-    File destFile( String::str( "ui/cur/%s.ozCur", ui::Mouse::NAMES[i] ) );
-
-    String realPath = inFile.realPath();
-
-    FILE* fs = fopen( realPath, "r" );
-    if( fs == nullptr ) {
-      OZ_ERROR( "Failed to open cursor description '%s'", realPath.cstr() );
-    }
-
-    int size, hotspotX, hotspotY;
-    char imgPath[32];
-
-    int nMatches = fscanf( fs, "%3d %3d %3d %31s", &size, &hotspotX, &hotspotY, imgPath );
-    if( nMatches != 4 ) {
-      OZ_ERROR( "Invalid xcursor line" );
-    }
-
-    fclose( fs );
-
-    Context::Texture tex = context.loadTexture( String::str( "@ui/cur/%s", imgPath ), false,
-                                                GL_NEAREST, GL_NEAREST );
-    OutputStream os( 0 );
-
-    os.writeInt( size );
-    os.writeInt( hotspotX );
-    os.writeInt( hotspotY );
-    tex.write( &os );
-
-    destFile.write( os.begin(), os.tell() );
-  }
-
-  context.useS3TC = useS3TC;
-
-  Log::unindent();
-  Log::println( "}" );
-}
-
 void UI::buildIcons()
 {
   if( File( "@ui/icon" ).type() != File::DIRECTORY ) {

diff --git a/src/builder/UI.hh b/src/builder/UI.hh
@@ -38,7 +38,6 @@ class UI
 
   public:
 
-    static void buildCursors();
     static void buildIcons();
     static void copyScheme();
 

diff --git a/src/client/BSP.cc b/src/client/BSP.cc
@@ -26,7 +26,7 @@
 
 #include <client/Context.hh>
 #include <client/SMM.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -34,10 +34,8 @@ add_library( client STATIC
   MenuStage.hh
   Mesh.hh
   NaClDownloader.hh
-  NaClPlatform.hh
   NaClUpdater.hh
   Network.hh
-  OpenGL.hh
   openzone.hh
   Profile.hh
   Proxy.hh
@@ -85,10 +83,8 @@ add_library( client STATIC
   MenuStage.cc
   Mesh.cc
   NaClDownloader.cc
-  NaClPlatform.cc
   NaClUpdater.cc
   Network.cc
-  OpenGL.cc
   Profile.cc
   Proxy.cc
   QuestList.cc

diff --git a/src/client/Caelum.cc b/src/client/Caelum.cc
@@ -28,7 +28,7 @@
 #include <client/Camera.hh>
 #include <client/Terra.hh>
 #include <client/Shape.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/CinematicProxy.cc b/src/client/CinematicProxy.cc
@@ -24,10 +24,10 @@
 #include <stable.hh>
 #include <client/CinematicProxy.hh>
 
+#include <ozEngine/Pepper.hh>
 #include <common/Timer.hh>
 #include <client/Camera.hh>
 #include <client/Sound.hh>
-#include <client/NaClPlatform.hh>
 #include <client/ui/GalileoFrame.hh>
 #include <client/ui/MusicPlayer.hh>
 #include <client/ui/UI.hh>

diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -26,6 +26,7 @@
 #include <stable.hh>
 #include <client/Client.hh>
 
+#include <ozEngine/Pepper.hh>
 #include <common/Timer.hh>
 #include <common/Lua.hh>
 #include <client/Camera.hh>
@@ -34,7 +35,6 @@
 #include <client/Sound.hh>
 #include <client/Render.hh>
 #include <client/Loader.hh>
-#include <client/NaClPlatform.hh>
 #include <client/NaClUpdater.hh>
 #include <client/Window.hh>
 #include <client/Input.hh>
@@ -381,9 +381,9 @@ int Client::init( int argc, char** argv )
 
 #ifdef __native_client__
 
-  NaClPlatform::post( "lang:" );
+  Pepper::post( "lang:" );
 
-  for( String message = NaClPlatform::poll(); ; message = NaClPlatform::poll() ) {
+  for( String message = Pepper::pop(); ; message = Pepper::pop() ) {
     if( message.isEmpty() ) {
       Time::sleep( 10 );
     }
@@ -392,7 +392,7 @@ int Client::init( int argc, char** argv )
       break;
     }
     else {
-      NaClPlatform::push( message );
+      Pepper::push( message );
     }
   }
 
@@ -473,7 +473,7 @@ int Client::init( int argc, char** argv )
   gameStage.init();
 
 #ifdef __native_client__
-  NaClPlatform::post( "none:" );
+  Pepper::post( "none:" );
 #endif
 
   Stage::nextStage = nullptr;
@@ -719,15 +719,14 @@ int Client::main()
 
 #ifdef __native_client__
 
-    if( NaClPlatform::width != window.width || NaClPlatform::height != window.height ) {
+    if( Pepper::width != window.width || Pepper::height != window.height ) {
       window.resize();
     }
-    if( window.hasFocus != NaClPlatform::hasFocus ) {
-      window.hasFocus = NaClPlatform::hasFocus;
+    if( window.hasFocus != Pepper::hasFocus ) {
+      window.hasFocus = Pepper::hasFocus;
       input.reset();
     }
-    for( String message = NaClPlatform::poll(); !message.isEmpty(); message = NaClPlatform::poll() )
-    {
+    for( String message = Pepper::pop(); !message.isEmpty(); message = Pepper::pop() ) {
       if( message.equals( "quit:" ) ) {
         isAlive = false;
       }

diff --git a/src/client/Context.cc b/src/client/Context.cc
@@ -35,7 +35,7 @@
 #include <client/BotAudio.hh>
 #include <client/VehicleAudio.hh>
 
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 #include <ozEngine/AL.hh>
 #include <client/eSpeak.hh>
 
@@ -643,7 +643,7 @@ void Context::load()
 void Context::unload()
 {
 #ifdef __native_client__
-  hard_assert( NaClPlatform::isMainThread() );
+  hard_assert( Pepper::isMainThread() );
 #endif
 
   Log::println( "Unloading Context {" );

diff --git a/src/client/ExplosionImago.cc b/src/client/ExplosionImago.cc
@@ -26,7 +26,7 @@
 
 #include <common/Timer.hh>
 #include <client/Context.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/FragPool.cc b/src/client/FragPool.cc
@@ -27,7 +27,7 @@
 #include <client/Shader.hh>
 #include <client/Context.hh>
 #include <client/SMM.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/GameStage.cc b/src/client/GameStage.cc
@@ -24,6 +24,7 @@
 #include <stable.hh>
 #include <client/GameStage.hh>
 
+#include <ozEngine/Pepper.hh>
 #include <matrix/Synapse.hh>
 #include <matrix/Matrix.hh>
 #include <nirvana/Nirvana.hh>
@@ -38,7 +39,6 @@
 #include <client/QuestList.hh>
 #include <client/MenuStage.hh>
 #include <client/Input.hh>
-#include <client/NaClPlatform.hh>
 #include <client/ui/LoadingArea.hh>
 
 namespace oz

diff --git a/src/client/Input.cc b/src/client/Input.cc
@@ -25,7 +25,6 @@
 #include <client/Input.hh>
 
 #include <client/Window.hh>
-#include <client/NaClPlatform.hh>
 
 namespace oz
 {
@@ -463,8 +462,12 @@ void Input::update()
 
 #if defined( __native_client__ )
 
-  mouseX = +NaClPlatform::moveX;
-  mouseY = -NaClPlatform::moveY;
+  mouseX = +Pepper::moveX;
+  mouseY = -Pepper::moveY;
+
+  int dx, dy;
+  SDL_GetRelativeMouseState( &dx, &dy );
+  printf( "SMM: %d, %d\n", dx, dy );
 
 #else
 

diff --git a/src/client/Input.hh b/src/client/Input.hh
@@ -23,6 +23,8 @@
 
 #pragma once
 
+#include <client/common.hh>
+
 #include <SDL.h>
 
 namespace oz

diff --git a/src/client/Loader.cc b/src/client/Loader.cc
@@ -32,7 +32,7 @@
 #include <client/MD2.hh>
 #include <client/MD3.hh>
 
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 #include <ozEngine/AL.hh>
 
 #include <SDL.h>

diff --git a/src/client/MD2.cc b/src/client/MD2.cc
@@ -26,7 +26,7 @@
 
 #include <common/Timer.hh>
 #include <client/Context.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/MD2Imago.cc b/src/client/MD2Imago.cc
@@ -26,7 +26,7 @@
 
 #include <client/Context.hh>
 #include <client/Camera.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/MD2WeaponImago.cc b/src/client/MD2WeaponImago.cc
@@ -26,7 +26,7 @@
 
 #include <client/Camera.hh>
 #include <client/Context.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/MD3.cc b/src/client/MD3.cc
@@ -25,7 +25,7 @@
 #include <client/MD3.hh>
 
 #include <client/Context.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/MD3Imago.cc b/src/client/MD3Imago.cc
@@ -26,7 +26,7 @@
 
 #include <client/Context.hh>
 #include <client/Camera.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {

diff --git a/src/client/MenuStage.cc b/src/client/MenuStage.cc
@@ -24,11 +24,11 @@
 #include <stable.hh>
 #include <client/MenuStage.hh>
 
+#include <ozEngine/Pepper.hh>
 #include <client/Camera.hh>
 #include <client/Render.hh>
 #include <client/Sound.hh>
 #include <client/Input.hh>
-#include <client/NaClPlatform.hh>
 
 namespace oz
 {

diff --git a/src/client/Mesh.cc b/src/client/Mesh.cc
@@ -26,7 +26,7 @@
 
 #include <client/Context.hh>
 #include <client/Terra.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/GL.hh>
 
 namespace oz
 {