Misc fixes & cleanups, NaCl-glibc, oz_* pkgs

- ozCore
  * System: removed jniEnv, module and core pointers since those can be easily
    obtained in other ways
  * more consistent log output for Android
- client
  * includes and defines are shown in CXXFLAGS
- cmake
  * fixed configuration for lua 5.2 when 5.1 is also present
  * OZ_ADDRESS_SANITIZER option
- ports
  * updated to openal-soft-1.15.1
  * NaCl-x86_64-glibc, NaCl-i686-glibc
- data packages renamed (oz_*)

CMakeLists.txt

@@ -8,6 +8,7 @@ project( openzone C CXX )
 
 set( OZ_VERSION 0.3.81 )
 
+option( OZ_ADDRESS_SANITIZER "Enable AddressSanitizer memory checker." OFF )
 option( OZ_TRACK_ALLOCS "Track memory allocations to detect new/delete mismatches and memory leaks." OFF )
 option( OZ_SIMD_MATH "Use SIMD implementation of linear algebra classes." OFF )
 option( OZ_ODE "Build complete ozDynamics library (requires Open Dynamics Engine)." OFF )
@@ -88,7 +89,7 @@ else()
   if( CMAKE_SYSTEM_NAME STREQUAL Linux )
     find_package( ALSA REQUIRED )
   endif()
-  pkg_check_modules( PULSE_SIMPLE libpulse-simple REQUIRED )
+  pkg_check_modules( PULSE_SIMPLE REQUIRED libpulse-simple )
 endif()
 
 find_package( PhysFS REQUIRED )
@@ -104,7 +105,7 @@ if( OZ_LUAJIT )
 
   include_directories( SYSTEM ${LUAJIT_INCLUDE_DIRS} )
 else()
-  find_package( Lua51 REQUIRED )
+  pkg_check_modules( LUA REQUIRED lua )
 endif()
 
 if( OZ_SDL2 )
@@ -113,20 +114,22 @@ if( OZ_SDL2 )
 
   include_directories( SYSTEM ${SDL2_INCLUDE_DIRS} )
 else()
-  find_package( SDL REQUIRED )
-  find_package( SDL_ttf REQUIRED )
+  pkg_check_modules( SDL REQUIRED sdl )
+  pkg_check_modules( SDL_TTF REQUIRED SDL_ttf )
 
-  mark_as_advanced( SDLMAIN_LIBRARY )
-  mark_as_advanced( SDL_INCLUDE_DIR )
-  mark_as_advanced( SDL_LIBRARY )
-
-  include_directories( SYSTEM ${SDL_INCLUDE_DIR} )
+  include_directories( SYSTEM ${SDL_INCLUDE_DIRS} )
 endif()
 
 if( OZ_GL_ES )
   # On embedded platform GLES is part of system libraries and is guaranteed to exist in toolchain or
   # platform directory, no need to explicitly check existence or to detect library names.
-  if( NOT PLATFORM_EMBEDDED )
+  if( ANDROID )
+    find_library( GLES2_LIBRARIES GLESv2 )
+    mark_as_advanced( GLES2_LIBRARIES )
+  elseif( NACL )
+    find_library( GLES2_LIBRARIES ppapi_gles2 )
+    mark_as_advanced( GLES2_LIBRARIES )
+  else()
     pkg_check_modules( GLES2 REQUIRED glesv2 )
   endif()
 else()
@@ -139,10 +142,10 @@ pkg_check_modules( VORBISFILE REQUIRED vorbisfile )
 # On embedded platforms linking is mostly static, so dependencies for all libraries must be linked
 # too.
 if( PLATFORM_EMBEDDED )
-  pkg_check_modules( VORBIS REQUIRED vorbis ) # required by vorbisfile
-  pkg_check_modules( OGG REQUIRED ogg )       # required by vorbisfile
-  find_package( Freetype REQUIRED )           # required by SDL_ttf
   find_package( ZLIB REQUIRED )               # required by PhysicsFS & FreeType
+  find_package( Freetype REQUIRED )           # required by SDL_ttf
+  pkg_check_modules( OGG REQUIRED ogg )       # required by vorbisfile
+  pkg_check_modules( VORBIS REQUIRED vorbis ) # required by vorbisfile
 endif()
 
 if( NOT PLATFORM_EMBEDDED )
@@ -170,15 +173,13 @@ mark_as_advanced( MINGW32_LIBRARY )
 #
 
 # Local libmad, faad and eSpeak headers.
-include_directories( SYSTEM ./include )
+include_directories( SYSTEM include )
 
 if( ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang )
   set( flags "-std=c++11 -pedantic" )
 
   # Use libc++ instead of libstdc++.
   # set( flags "${flags} -stdlib=libc++" )
-  # AddressSanitizer memory checker
-  # set( flags "${flags} -fsanitize=address" )
   # Analyse only.
   # set( flags "${flags} --analyze -Qunused-arguments" )
 elseif( ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.5 )
@@ -188,8 +189,11 @@ elseif( ANDROID )
 else()
   set( flags "-pipe -std=c++0x -pedantic -fstrict-enums" )
 endif()
+if( OZ_ADDRESS_SANITIZER )
+  set( flags "${flags} -fsanitize=address" )
+endif()
 
-set( flags "${flags} -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -ffast-math" )
+set( flags "${flags} -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -ffast-math" )
 
 # Additional warnings.
 if( ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang )
@@ -201,12 +205,8 @@ else()
   set( flags "${flags} -Wmissing-declarations -Wnon-virtual-dtor -Woverloaded-virtual" )
   set( flags "${flags} -Wformat=2 -Wmissing-format-attribute -Winvalid-pch" )
 
-  if( NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.6 )
-    # set( flags "${flags} -Wsuggest-attribute=noreturn" )
-  endif()
-  if( NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.7 )
-    # set( flags "${flags} -Wzero-as-null-pointer-constant" )
-  endif()
+  # set( flags "${flags} -Wsuggest-attribute=noreturn" )
+  # set( flags "${flags} -Wzero-as-null-pointer-constant" )
 endif()
 
 set( CMAKE_CXX_FLAGS "${flags} ${CMAKE_CXX_FLAGS}" )
@@ -215,6 +215,16 @@ set( CMAKE_CXX_FLAGS "${flags} ${CMAKE_CXX_FLAGS}" )
 string( TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" OZ_CXX_FLAGS )
 string( STRIP "${CMAKE_CXX_FLAGS} ${${OZ_CXX_FLAGS}}" OZ_CXX_FLAGS )
 
+get_directory_property( _includes INCLUDE_DIRECTORIES )
+foreach( _include ${_includes} )
+  set( OZ_CXX_FLAGS "${OZ_CXX_FLAGS} -I${_include}" )
+endforeach()
+
+get_directory_property( _defines COMPILE_DEFINITIONS )
+foreach( _define ${_defines} )
+  set( OZ_CXX_FLAGS "${OZ_CXX_FLAGS} -D${_define}" )
+endforeach()
+
 site_name( OZ_HOSTNAME )
 mark_as_advanced( OZ_HOSTNAME )
 

README.md

@@ -51,6 +51,11 @@ MinGW32 is searched in `/usr/i486-mingw32` by default. You may change that in
 
 You may also want to set several options when configuring CMake build system:
 
+- `OZ_ADDRESS_SANITIZER`: Compile with AddressSanitizer support. AddressSanitizer is a memory
+  checker that detects stack and heap buffer overruns, malloc/free misuse and other memory errors.
+  GCC >= 4.8 or LLVM/Clang >= 3.2 is required.
+  `OFF` by default.
+
 - `OZ_TRACK_ALLOCS`: Enable tracking of allocated memory chunks in liboz. Stack trace for every
   memory allocation performed via new operator is saved for later diagnostics. It detects new/delete
   mismatches and one can check for currently allocated memory chunks (and hence memory leaks).

TODO.md

@@ -1,6 +1,9 @@
 CURRENT
 
 - fix random splash event bug
+- keyboard control of UI
+- TalkFrame
+- per-game data subdirs
 
 0.4
 
@@ -42,3 +45,10 @@ CURRENT
 - unittest
     * write missing tests
 - documentation
+
+2.0
+
+- ozDynamics
+    * finish ozDynamics
+- matrix
+    * collision islands

build.sh

@@ -15,13 +15,14 @@ buildType=Debug
 platforms=(
   Linux-x86_64 Linux-x86_64-Clang Linux-i686 Linux-i686-Clang
   Windows-i686
-  NaCl-x86_64 NaCl-i686 PNaCl
+  NaCl-x86_64 NaCl-x86_64-glibc NaCl-i686 NaCl-i686-glibc PNaCl
   Android14-i686 Android14-ARM Android14-ARMv7a Android14-MIPS
 )
 
-# Extract path to PNaCl SDK from CMake toolchain file.
-pnaclRoot=`egrep '^set\( PLATFORM_PREFIX' cmake/PNaCl.Toolchain.cmake | \
-          sed -r 's|^set\( PLATFORM_PREFIX *"(.*)\" \)|\1|'`
+# Extract path to NaCl SDK from CMake toolchain files.
+naclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64.Toolchain.cmake`
+naclGNUPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64-glibc.Toolchain.cmake`
+pnaclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/PNaCl.Toolchain.cmake`
 
 function clean()
 {
@@ -63,8 +64,8 @@ function pnacl()
 {
   for arch in x86_64 i686 arm; do
     echo "Building openzone.$arch.nexe"
-    "$pnaclRoot/bin64/pnacl-translate" -arch $arch -o build/PNaCl/src/tools/openzone.$arch.nexe \
-                                       build/PNaCl/src/tools/openzone.pexe
+    "$pnaclPrefix/bin64/pnacl-translate" -arch $arch -o build/PNaCl/src/tools/openzone.$arch.nexe \
+                                         build/PNaCl/src/tools/openzone.pexe
   done
 }
 

clean-blanks.sh

@@ -10,10 +10,7 @@
 # each file, remove duplicated blank lines and then remove one blank line at the end of each file.
 #
 
-files=`git ls-files | \
-       egrep -v '^include/|^doc/licences|\.patch$|\.po$' | \
-       egrep -v 'README' | \
-       egrep -v 'header\.glsl'`
+files=`git ls-files | egrep -v '^README|^doc/licences/|\.patch$|^include/|\.po$|/header\.glsl$'`
 
 for file in $files; do
   # Remove trailing blanks at the end of line.

cmake/Android14-ARM.Toolchain.cmake

@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID                    ON )
 
 set( PLATFORM_EMBEDDED          ON )
 set( PLATFORM_TRIPLET           "arm-linux-androideabi" )

cmake/Android14-ARMv7a.Toolchain.cmake

@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID                    ON )
 
 set( PLATFORM_EMBEDDED          ON )
 set( PLATFORM_TRIPLET           "arm-linux-androideabi" )

cmake/Android14-MIPS.Toolchain.cmake

@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID                    ON )
 
 set( PLATFORM_EMBEDDED          ON )
 set( PLATFORM_TRIPLET           "mipsel-linux-android" )

cmake/Android14-i686.Toolchain.cmake

@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID                    ON )
 
 set( PLATFORM_EMBEDDED          ON )
 set( PLATFORM_TRIPLET           "i686-linux-android" )

cmake/NaCl-i686-glibc.Toolchain.cmake

@@ -0,0 +1,16 @@
+set( NACL                       ON )
+set( NACL_GLIBC                 ON )
+
+set( PLATFORM_EMBEDDED          ON )
+set( PLATFORM_TRIPLET           "i686-nacl" )
+set( PLATFORM_PREFIX            "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_glibc" )
+set( PLATFORM_PORTS_PREFIX      "${CMAKE_SOURCE_DIR}/ports/NaCl-i686-glibc" )
+set( PLATFORM_EXE_SUFFIX        ".i686.nexe" )
+
+set( CMAKE_SYSTEM_NAME          "Linux" CACHE STRING "Target system." )
+set( CMAKE_SYSTEM_PROCESSOR     "i686" CACHE STRING "Target processor." )
+set( CMAKE_FIND_ROOT_PATH       "${PLATFORM_PORTS_PREFIX};${PLATFORM_PREFIX}/x86_64-nacl" )
+set( CMAKE_C_COMPILER           "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-gcc" )
+set( CMAKE_CXX_COMPILER         "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-g++" )
+set( CMAKE_C_FLAGS              "-msse3 -mfpmath=sse" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS            "-msse3 -mfpmath=sse" CACHE STRING "" )

cmake/NaCl-i686.Toolchain.cmake

@@ -1,4 +1,4 @@
-set( NACL ON )
+set( NACL                       ON )
 
 set( PLATFORM_EMBEDDED          ON )
 set( PLATFORM_TRIPLET           "i686-nacl" )

cmake/NaCl-x86_64-glibc.Toolchain.cmake

@@ -0,0 +1,16 @@
+set( NACL                       ON )
+set( NACL_GLIBC                 ON )
+
+set( PLATFORM_EMBEDDED          ON )
+set( PLATFORM_TRIPLET           "x86_64-nacl" )
+set( PLATFORM_PREFIX            "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_glibc" )
+set( PLATFORM_PORTS_PREFIX      "${CMAKE_SOURCE_DIR}/ports/NaCl-x86_64-glibc" )
+set( PLATFORM_EXE_SUFFIX        ".x86_64.nexe" )
+
+set( CMAKE_SYSTEM_NAME          "Linux" CACHE STRING "Target system." )
+set( CMAKE_SYSTEM_PROCESSOR     "x86_64" CACHE STRING "Target processor." )
+set( CMAKE_FIND_ROOT_PATH       "${PLATFORM_PORTS_PREFIX};${PLATFORM_PREFIX}/x86_64-nacl" )
+set( CMAKE_C_COMPILER           "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-gcc" )
+set( CMAKE_CXX_COMPILER         "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-g++" )
+set( CMAKE_C_FLAGS              "-msse3" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS            "-msse3" CACHE STRING "" )

cmake/NaCl-x86_64.Toolchain.cmake

@@ -1,4 +1,4 @@
-set( NACL ON )
+set( NACL                       ON )
 
 set( PLATFORM_EMBEDDED          ON )
 set( PLATFORM_TRIPLET           "x86_64-nacl" )

cmake/PNaCl.Toolchain.cmake

@@ -1,4 +1,4 @@
-set( NACL ON )
+set( NACL                       ON )
 
 set( PLATFORM_EMBEDDED          ON )
 set( PLATFORM_TRIPLET           "pnacl" )

data/rz_main/baseq3/maps/testCastle.json

@@ -0,0 +1,88 @@
+{
+  "title":              "test castle",
+  "life":               20000,
+
+  "fragPool":           "ruins",
+  "nFrags":             100,
+
+  "demolishSound":      "free/explode",
+
+  "waterFogColour":     [ 0.15, 0.00, 0.15, 1.00 ],
+
+  "boundObjects":
+  [
+    {
+      "class":          "bauul",
+      "pos":            [ 0, 0, 10 ],
+      "heading":        "NORTH"
+    }
+  ],
+  "entities":
+  [
+    {
+      "title":          "crusher",
+      "type":           "CRUSHING_BLOCK",
+      "target":         0,
+      "move":           [ 0, 7.68, 0 ],
+      "slideTime":      2.0,
+      "// timeout":        3.0,
+      "openSound":      "free/rumble",
+      "closeSound":     "free/rumble",
+      "frictSound":     "kaiser_fx/hum6"
+    },
+    {
+      "title":          "ignorant",
+      "type":           "IGNORING_BLOCK",
+      "move":           [ 0, 7.68, 0 ],
+      "slideTime":      2.0,
+      "// timeout":        4.0,
+      "openSound":      "free/rumble",
+      "closeSound":     "free/rumble",
+      "frictSound":     "kaiser_fx/hum6",
+      "model":
+      {
+        "name":         "biotank",
+        "translation":  [ 0, -1, 0.5 ],
+        "rotation":     [ 0, 0, 90 ]
+      }
+    },
+    {
+      "title":          "auto door",
+      "type":           "AUTO_DOOR",
+      "target":         2,
+      "move":           [ 2.55, 0, 0 ],
+      "slideTime":      2.0,
+      "timeout":        2.0,
+      "openSound":      "free/itemback",
+      "closeSound":     "free/itemback",
+      "frictSound":     ""
+    },
+    {
+      "title":          "manual door",
+      "type":           "MANUAL_DOOR",
+      "target":         3,
+      "key":            1,
+      "move":           [ 5, 0, 0 ],
+      "slideTime":      2.0,
+      "openSound":      "free/itemback",
+      "closeSound":     "free/itemback",
+      "frictSound":     ""
+    },
+    {
+      "title":          "elevator",
+      "type":           "ELEVATOR",
+      "target":         4,
+      "move":           [ 0, 0, 3 ],
+      "slideTime":      2.5,
+      "openSound":      "",
+      "closeSound":     "",
+      "frictSound":     "kaiser_fx/hum6"
+    },
+    {
+      "title":          "switch",
+      "type":           "STATIC",
+      "target":         3,
+      "openSound":      "openarena/clack"
+    }
+  ]
+}

etc/data-usage.lua

@@ -1,5 +1,3 @@
-#!/usr/bin/lua
-
 SIZE        = 8192
 DIM         = 8
 TERRA_DIM   = 8