ozFactory, DDS fixed, File::directory()

- ozCore
  * String::fileDirectory(), File::directory()
- ozEngine
  * Shader class (not woking yet)
  * GL, AL loaders for InputStream
- ozFactory: builder library
  * DDS builder moved ozFactory and fixed

CMakeLists.txt

@@ -11,12 +11,12 @@ set( OZ_VERSION 0.3.81 )
 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_DYNAMICS "Build complete ozDynamics library with ODE support." OFF )
+option( OZ_SDL2 "Use SDL 2.0 instead of SDL 1.2." OFF )
 option( OZ_GL_ES "Use OpenGL ES 2.0 instead of OpenGL 2.1." OFF )
+option( OZ_NONFREE "Enable support for building S3TC textures." OFF )
 
 option( OZ_LUAJIT "Use use LuaJIT 2.0 instead of official Lua." OFF )
-option( OZ_SDL2 "Use SDL 2.0 instead of SDL 1.2." OFF )
 option( OZ_NET "Enable networking support." OFF )
-option( OZ_NONFREE "Enable support for building S3TC textures." OFF )
 
 option( OZ_STANDALONE "Install layout appropriate for launching from its own folder." OFF )
 option( OZ_TESTS "Build test programs (that should only be used by me)." OFF )
@@ -136,7 +136,7 @@ endif()
 
 if( NOT PLATFORM_EMBEDDED )
   find_library( FREEIMAGE_LIBRARY freeimage )
-  find_library( FREEIMAGEPLUS_LIBRARY freeimageplus)
+  find_library( FREEIMAGEPLUS_LIBRARY freeimageplus )
   mark_as_advanced( FREEIMAGE_LIBRARY )
   mark_as_advanced( FREEIMAGEPLUS_LIBRARY )
 

README.md

@@ -267,7 +267,6 @@ The following alternative launches are available:
   NaCl port. If `strip` is passed as the second option, binaries are stripped too.
 
 Documentation
-
 -------------
 
 To generate documentation from source code with Doxygen, run

autogen.sh

@@ -10,7 +10,9 @@
 #
 
 version=0.3.81
-components=( ozCore ozDynamics ozEngine common matrix nirvana modules client builder unittest )
+components=( ozCore ozDynamics ozEngine ozFactory
+             common matrix nirvana modules client builder
+             unittest )
 
 # Generate CMakeLists.txt files.
 for component in ${components[@]}; do

etc/PKGBUILD

@@ -31,9 +31,9 @@ function build()
 
 function package_liboz()
 {
-  pkgdesc='OpenZone Core, Dynamics and Engine Libraries'
+  pkgdesc='OpenZone ozCore, ozDynamics, ozEngine and ozFactory libraries'
   license=('ZLIB')
-  depends=('libpulse' 'physfs')
+  depends=('libpulse' 'physfs' 'sdl_ttf' 'libgl' 'openal' 'freeimage')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
@@ -47,7 +47,7 @@ function package_liboz()
 function package_openzone()
 {
   pkgdesc='Simple cross-platform FPS/RTS game engine'
-  depends=('freeimage' 'libgl' 'liboz' 'luajit' 'openal' 'openzone-data' 'sdl_ttf')
+  depends=('liboz' 'luajit' 'openzone-data')
   optdepends=('espeak: speech synthesis'
               'libmad: MP3 streaming'
               'faad2: AAC streaming'

etc/openzone.spec

@@ -31,30 +31,28 @@ and front-end that renders it and enables the player to manipulate with the
 simulated world.
 
 %package -n liboz
-Summary:        OpenZone Core, Dynamics and Engine Libraries
+Summary:        OpenZone ozCore, ozDynamics, ozEngine and ozFactory libraries
 Group:          System Environment/Libraries
 License:        zlib
 
 %description -n liboz
-OpenZone Core Library provides facilities like container templates, array
-utilities, string class, memory manager with memory leak tracing, crash
-handlers, I/O buffers and classes for filesystem access with PhysicsFS support,
-log writer, JSON file manipulation class, math functions and linear algebra
-classes.
-OpenZone Dynamics Library is a rigid body physics engine used in OpenZone
-engine.
-OpenZone Engine Library contains basic engine building blocks for OpenZone
-game.
+ozCore library provides facilities like container templates, array utilities,
+string class, memory manager with memory leak tracing, crash handlers,
+I/O buffers and classes for filesystem access with PhysicsFS support,
+log writer, JSON file manipulation class, math functions and math classes.
+ozDynamics library is a rigid body physics engine used in OpenZone engine.
+ozEngine library contains basic engine building blocks for OpenZone game.
+ozFactory library contains functions for building OpenZone assets.
 
 %package -n liboz-devel
-Summary:        Headers for OpenZone Core, Dynamics and Engine Libraries
+Summary:        Headers for liboz
 Group:          Development/Libraries
 License:        zlib
 Requires:       liboz = %{version}
 
 %description -n liboz-devel
-This package contains header files for OpenZone Core, Dynamics and Engine
-Libraries.
+This package contains header files for OpenZone ozCore, ozDynamics, ozEngine and
+ozFactory libraries.
 
 %package data
 Summary:        OpenZone game data
@@ -106,16 +104,19 @@ install -m644 share/openzone/*.zip "$RPM_BUILD_ROOT"%{_datadir}/openzone
 %{_libdir}/libozCore.so*
 %{_libdir}/libozDynamics.so*
 %{_libdir}/libozEngine.so*
+%{_libdir}/libozFactory.so*
 %doc src/ozCore/COPYING
 
 %files -n liboz-devel
 %defattr(-, root, root, -)
 %{_libdir}/pkgconfig/ozCore.pc
 %{_libdir}/pkgconfig/ozDynamics.pc
 %{_libdir}/pkgconfig/ozEngine.pc
+%{_libdir}/pkgconfig/ozFactory.pc
 %{_includedir}/ozCore
 %{_includedir}/ozDynamics
 %{_includedir}/ozEngine
+%{_includedir}/ozFactory
 %doc src/ozCore/COPYING
 
 %files data

src/CMakeLists.txt

@@ -4,6 +4,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 add_subdirectory( ozCore )
 add_subdirectory( ozDynamics )
 add_subdirectory( ozEngine )
+add_subdirectory( ozFactory )
 add_subdirectory( unittest )
 
 add_pch( pch stable.hh stable.cc )

src/builder/MD3.cc

@@ -36,7 +36,7 @@ void MD3::readAnimData()
 {
   File animFile( sPath + "/animation.cfg" );
 
-  String realPath = animFile.realDir() + "/" + animFile.path();
+  String realPath = animFile.realDirectory() + "/" + animFile.path();
 
   FILE* fs = fopen( realPath, "r" );
   if( fs == nullptr ) {

src/builder/OBJ.cc

@@ -288,7 +288,7 @@ void OBJ::load()
 
   config.clear( true );
 
-  String realPath = modelFile.realDir() + "/" + &path[1];
+  String realPath = modelFile.realDirectory() + "/" + &path[1];
 
   loadMaterials( realPath + "/data.mtl" );
 

src/builder/common.hh

@@ -24,6 +24,7 @@
 #pragma once
 
 #include <client/common.hh>
+#include <ozFactory/ozFactory.hh>
 #include <builder/config.hh>
 
 namespace oz

src/ozCore/CMakeLists.txt

@@ -76,16 +76,21 @@ add_library( ozCore
 )
 
 if( ANDROID )
-  target_link_libraries( ozCore ${PHYSFS_LIBRARY} ${ZLIB_LIBRARY} -ldl -lOpenSLES -llog ${PLATFORM_STL_LIBRARY} )
+  target_link_libraries( ozCore ${PLATFORM_STL_LIBRARY} -llog -lOpenSLES -ldl )
 elseif( NACL )
-  target_link_libraries( ozCore ${PHYSFS_LIBRARY} ${ZLIB_LIBRARY} -lppapi_cpp -lppapi -lpthread )
+  target_link_libraries( ozCore -lpthread -lppapi -lppapi_cpp )
 elseif( WIN32 )
-  target_link_libraries( ozCore ${PHYSFS_LIBRARY} -lwinmm )
+  target_link_libraries( ozCore -lwinmm )
 elseif( NOT CMAKE_SYSTEM_NAME STREQUAL Linux )
-  target_link_libraries( ozCore ${PHYSFS_LIBRARY} -ldl -lpulse-simple -lrt -lpthread )
+  target_link_libraries( ozCore -lpthread -lrt -lpulse-simple -ldl )
 else()
   # TODO: Remove -lrt once glibc 2.17 becomes minimum.
-  target_link_libraries( ozCore ${PHYSFS_LIBRARY} -ldl -lpulse-simple -lasound -lrt -lpthread )
+  target_link_libraries( ozCore -lpthread -lrt -lasound -lpulse-simple -ldl )
+endif()
+
+target_link_libraries( ozCore ${PHYSFS_LIBRARY} )
+if( PLATFORM_EMBEDDED )
+  target_link_libraries( ozCore ${ZLIB_LIBRARY} )
 endif()
 
 set_target_properties( ozCore PROPERTIES VERSION ${OZ_VERSION} SOVERSION 0 )

src/ozCore/File.cc

@@ -332,7 +332,7 @@ bool File::stat()
   return fileType != MISSING;
 }
 
-String File::realDir() const
+String File::realDirectory() const
 {
   if( filePath.fileIsVirtual() ) {
     const char* realDir = PHYSFS_getRealDir( &filePath[1] );

src/ozCore/File.hh

@@ -180,33 +180,43 @@ class File
     }
 
     /**
-     * %File name.
+     * Extract directory from the path (substring before the last `/`).
+     */
+    String directory() const
+    {
+      return filePath.fileDirectory();
+    }
+
+    /**
+     * Extract file name from the path (substring after the last `/`).
      */
     String name() const
     {
       return filePath.fileName();
     }
 
     /**
-     * Name without the extension (and the dot).
+     * Extract base file name from the path (substring after the last `/` till the last dot
+     * following it).
      */
     String baseName() const
     {
       return filePath.fileBaseName();
     }
 
     /**
-     * Extension (part of base name after the last dot) or "" if no dot in base name.
+     * Extract file extension from the path (substring after the last dot in file name or "" if no
+     * extension).
      */
     String extension() const
     {
       return filePath.fileExtension();
     }
 
     /**
-     * True iff the extension (without dot) is equal to the given string.
+     * True iff file name has the given extension.
      *
-     * Empty string matches both no extension and files ending with dot.
+     * Empty string matches both no extension and files names ending with dot.
      */
     bool hasExtension( const char* ext ) const
     {
@@ -216,7 +226,7 @@ class File
     /**
      * %Path to the archive or mount-point of a VFS, "" for native files.
      */
-    String realDir() const;
+    String realDirectory() const;
 
     /**
      * %Path to file in native file system.

src/ozCore/Math.hh

@@ -465,7 +465,7 @@ class Math
     }
 
     /**
-     * Index (counting from the least significant side) of the first 1 bit or -1 if `v` is 0.
+     * Index of the first 1 bit (counting from the least significant bit) or -1 if `v` is 0.
      */
     template <typename Value = int>
     OZ_ALWAYS_INLINE

src/ozCore/String.cc

@@ -51,7 +51,7 @@ String::String( int count_, int ) :
 }
 
 OZ_HIDDEN
-inline void String::ensureCapacity( int newCount )
+void String::ensureCapacity( int newCount )
 {
   hard_assert( buffer != nullptr && count >= 0 && newCount >= 0 );
 
@@ -164,6 +164,13 @@ DArray<String> String::split( const char* s, char delimiter )
   return array;
 }
 
+String String::fileDirectory( const char* s )
+{
+  int slash = lastIndex( s, '/' );
+
+  return slash >= 0 ? substring( s, 0, slash ) : String( s );
+}
+
 String String::fileName( const char* s )
 {
   int begin = s[0] == '@';
@@ -678,6 +685,7 @@ String String::create( int length, char** buffer_ )
 {
   String r( length, 0 );
 
+  r.buffer[length] = '\0';
   *buffer_ = r.buffer;
   return r;
 }
@@ -854,6 +862,13 @@ DArray<String> String::split( char delimiter ) const
   return array;
 }
 
+String String::fileDirectory() const
+{
+  int slash = lastIndex( '/' );
+
+  return slash >= 0 ? substring( 0, slash ) : String( buffer );
+}
+
 String String::fileName() const
 {
   int begin = buffer[0] == '@';