diff --git a/.travis.yml b/.travis.yml
index e32b0703..5a7c70f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ language: cpp
compiler:
- gcc
- clang
+git:
+ submodules: false
#branches:
# only:
# - master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fcea0c9..ffd5a7da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
special_check_for_sse( ${MAX_SSE_LEVEL_DESIRED} )
ENDIF()
- OPTION(WANT_STREFLOP "use the library streflop" ON)
+ OPTION(WANT_STREFLOP "use the library streflop" OFF)
IF(WANT_STREFLOP)
ADD_DEFINITIONS("-DUSE_STREFLOP -DSTREFLOP_RANDOM_GEN_SIZE=32 -DLIBM_COMPILING_FLT32 -DN_SPECIALIZED=32")
@@ -335,13 +335,13 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/")
IF(APPLE)
include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)
- ENDIF(APPLE)
+ ENDIF()
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tests )
ENDIF()
# Check if data exist
-IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/")
+IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/CMakeLists.txt")
MESSAGE(STATUS "**Found game data.")
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/data/glest_game )
ENDIF()
diff --git a/README.txt b/README.txt
deleted file mode 120000
index f1954722..00000000
--- a/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-docs/README.txt
\ No newline at end of file
diff --git a/README.txt b/README.txt
new file mode 100644
index 00000000..052b15ca
--- /dev/null
+++ b/README.txt
@@ -0,0 +1 @@
+Please refer to docs/ for all documentation, license and copyright information.
diff --git a/data/glest_game b/data/glest_game
index aec11c73..8e0dc1b0 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit aec11c737122384e87957f287ea00314d5523eb2
+Subproject commit 8e0dc1b0a3f856da10fb66e3b703e79f86a78b18
diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh
index e3b59d67..486b839d 100755
--- a/mk/linux/setupBuildDeps.sh
+++ b/mk/linux/setupBuildDeps.sh
@@ -116,7 +116,7 @@ case $distribution in
case $release in
6.0*|unstable)
# No libvlc-dev since version (1.1.3) in Debian 6.0/Squeeze is incompatible, no libluajit-5.1-dev because it is not available on Debian 6.0/Squeeze, cf. http://glest.org/glest_board/?topic=8460
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev'
$installcommand
if [ $? != 0 ]; then
error_during_installation;
@@ -126,7 +126,7 @@ case $distribution in
fi
;;
*)
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev'
unsupported_release
exit 1
;;
@@ -139,22 +139,22 @@ case $distribution in
fi
case $release in
8.04)
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libcppunit-dev'
$installcommand
if [ $? != 0 ]; then error_during_installation; exit 1; fi
;;
10.04)
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew1.5-dev libftgl-dev libfribidi-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew1.5-dev libftgl-dev libfribidi-dev libcppunit-dev'
$installcommand
if [ $? != 0 ]; then error_during_installation; exit 1; fi
;;
11.10|12.04|12.10|13.04|13.10)
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
$installcommand
if [ $? != 0 ]; then error_during_installation; exit 1; fi
;;
*)
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
unsupported_release
exit 1
;;
@@ -168,12 +168,12 @@ case $distribution in
case $release in
13|14|15)
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
$installcommand
if [ $? != 0 ]; then error_during_installation; exit 1; fi
;;
*)
- installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
+ installcommand='apt-get install '"$APT_OPTIONS"' build-essential cmake libsdl1.2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev'
unsupported_release
exit 1
;;
@@ -183,17 +183,17 @@ case $distribution in
SuSE|SUSE?LINUX|Opensuse)
case $release in
11.2|11.3|11.4|12.1)
- installcommand='zypper install gcc gcc-c++ cmake libSDL-devel libxerces-c-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
+ installcommand='zypper install gcc gcc-c++ cmake libSDL-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
$installcommand
if [ $? != 0 ]; then error_during_installation; exit 1; fi
;;
12.2)
- installcommand='zypper install gcc gcc-c++ cmake libSDL-devel libxerces-c-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
+ installcommand='zypper install gcc gcc-c++ cmake libSDL-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
$installcommand
if [ $? != 0 ]; then error_during_installation; exit 1; fi
;;
*)
- installcommand='zypper install gcc gcc-c++ cmake libSDL-devel libxerces-c-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
+ installcommand='zypper install gcc gcc-c++ cmake libSDL-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
unsupported_release
exit 1
;;
@@ -207,11 +207,11 @@ case $distribution in
$installcommand
if [ $? != 0 ]; then error_during_installation; exit 1; fi
- installcommand='yum install cmake SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
+ installcommand='yum install cmake SDL-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
$installcommand
;;
*)
- installcommand='yum groupinstall "Development Tools"; yum install cmake SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
+ installcommand='yum groupinstall "Development Tools"; yum install cmake SDL-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel'
unsupported_release
exit 1
;;
diff --git a/mk/windoze/CopySharedBinarySetup.bat b/mk/windoze/CopySharedBinarySetup.bat
deleted file mode 100644
index bb56f8e6..00000000
--- a/mk/windoze/CopySharedBinarySetup.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-
-rem copy ..\shared\*.ini .\
-rem copy glest.ini ..\..\data\glest_game\
-if not "%1" == "nopause" pause
diff --git a/mk/windoze/build-mg-2010.bat b/mk/windoze/build-mg-2010.bat
index 20cf9d4c..6598f76e 100644
--- a/mk/windoze/build-mg-2010.bat
+++ b/mk/windoze/build-mg-2010.bat
@@ -37,7 +37,6 @@ goto processBuildStageA
:processBuildStageA
call CopyWindowsRuntimeDlls_2010.bat nopause
-call CopySharedBinarySetup.bat nopause
rem setup the Visual Studio 2010 environment
ECHO --------------------------------
diff --git a/mk/windoze/build-mg-2012.bat b/mk/windoze/build-mg-2012.bat
index bdcddb7e..511a4b85 100644
--- a/mk/windoze/build-mg-2012.bat
+++ b/mk/windoze/build-mg-2012.bat
@@ -44,7 +44,6 @@ goto processBuildStageA
:processBuildStageA
call CopyWindowsRuntimeDlls_2012.bat nopause
-call CopySharedBinarySetup.bat nopause
rem setup the Visual Studio 2010 environment
ECHO --------------------------------
diff --git a/mk/windoze/coverity-scan.bat b/mk/windoze/coverity-scan.bat
index 29c61199..cb038ba4 100644
--- a/mk/windoze/coverity-scan.bat
+++ b/mk/windoze/coverity-scan.bat
@@ -15,15 +15,15 @@ rem Project name (case sensitive)
set PROJECT=MegaGlest
rem read in config settings
-if not exist ".coverity-submit" (
+if not exist ".coverity-scan" (
echo -----------------------------------------
- echo **Missing Config** To use this script please create a config file named [%CD%\.coverity-submit]
+ echo **Missing Config** To use this script please create a config file named [%CD%\.coverity-scan]
echo Containing: TOKEN=x , EMAIL=x , COVERITY_ANALYSIS_ROOT=x , NUMCORES=x
goto END
)
setlocal disabledelayedexpansion
-FOR /F "tokens=1* delims==" %%i IN (.coverity-submit) DO set "prop_%%i=%%j"
+FOR /F "tokens=1* delims==" %%i IN (.coverity-scan) DO set "prop_%%i=%%j"
rem Coverity Scan project token as listed on the Coverity Scan project page
set TOKEN=%prop_TOKEN%
diff --git a/mk/windoze/glest_game.vcxproj b/mk/windoze/glest_game.vcxproj
index 1cd6ae70..aa179be1 100644
--- a/mk/windoze/glest_game.vcxproj
+++ b/mk/windoze/glest_game.vcxproj
@@ -117,7 +117,7 @@
false
../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/xml/rapidxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/SDL-1.2.15/include;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/windows_deps/libircclient/include;../../source/windows_deps/glew-1.7.0/include;../../source/windows_deps/google-breakpad\trunk\src\client\windows\;../../source/windows_deps/google-breakpad\trunk\src\;../../source/shared_lib/include/compression
%(AdditionalUsingDirectories)
- WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP_XXX;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
true
Async
MultiThreaded
diff --git a/mk/windoze/megaglest_tests.vcxproj b/mk/windoze/megaglest_tests.vcxproj
index f1252783..8c3eceb9 100644
--- a/mk/windoze/megaglest_tests.vcxproj
+++ b/mk/windoze/megaglest_tests.vcxproj
@@ -75,7 +75,7 @@
MaxSpeed
true
true
- WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP_XXX;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/xml/rapidxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/SDL-1.2.15/include;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/windows_deps/libircclient/include;../../source/windows_deps/glew-1.7.0/include;../../source/windows_deps/google-breakpad\trunk\src\client\windows\;../../source/windows_deps/google-breakpad\trunk\src\;../../source/windows_deps/cppunit/include
MultiThreaded
Precise
diff --git a/mk/windoze/shared_lib.vcxproj b/mk/windoze/shared_lib.vcxproj
index 3e90a201..56db15a2 100644
--- a/mk/windoze/shared_lib.vcxproj
+++ b/mk/windoze/shared_lib.vcxproj
@@ -59,8 +59,8 @@
Disabled
- ../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/sound;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/xerces-c-3.1.1/src/xercesc/xinclude;../../source/windows_deps/lpng1510;../../source/windows_deps/jpeg-8a;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;../../source/windows_deps/ftgl-2.1.3-rc5/src;../../source/windows_deps/freetype-2.4.4/include;../../source/windows_deps/glew-1.7.0/include;../../source/shared_lib/include/graphics/md5;../../source/shared_lib/include/graphics/freetype-gl;../../source/shared_lib/include/streflop/softfloat;../../source/shared_lib/include/xml/rapidxml;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/platform/win32;../../source/windows_deps/vlc-2.1.2/include;../../source/shared_lib/include/compression;../../source/shared_lib/sources/
- WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;%(PreprocessorDefinitions)
+ ../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/sound;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/xerces-c-3.1.1/src/xercesc/xinclude;../../source/windows_deps/lpng1510;../../source/windows_deps/jpeg-8a;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;../../source/windows_deps/ftgl-2.1.3-rc5/src;../../source/windows_deps/freetype-2.4.4/include;../../source/windows_deps/glew-1.7.0/include;../../source/shared_lib/include/graphics/md5;../../source/shared_lib/include/streflop/softfloat;../../source/shared_lib/include/xml/rapidxml;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/platform/win32;../../source/windows_deps/vlc-2.1.2/include;../../source/shared_lib/include/compression;../../source/shared_lib/sources/
+ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;%(PreprocessorDefinitions)
true
true
EnableFastChecks
@@ -95,8 +95,8 @@
true
Speed
false
- ../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/sound;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/xerces-c-3.1.1/src/xercesc/xinclude;../../source/windows_deps/lpng1510;../../source/windows_deps/jpeg-8a;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;../../source/windows_deps/ftgl-2.1.3-rc5/src;../../source/windows_deps/freetype-2.4.4/include;../../source/windows_deps/glew-1.7.0/include;../../source/shared_lib/include/graphics/md5;../../source/shared_lib/include/graphics/freetype-gl;../../source/shared_lib/include/streflop/softfloat;../../source/shared_lib/include/xml/rapidxml;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/platform/win32;../../source/windows_deps/vlc-2.1.2/include;../../source/windows_deps/fribidi-0.19.5/lib;../../source/windows_deps/fribidi-0.19.5/charset;../../source/shared_lib/include/compression;../../source/shared_lib/sources/
- WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL_XXX;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;HAVE_FRIBIDI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
+ ../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/sound;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/xerces-c-3.1.1/src/xercesc/xinclude;../../source/windows_deps/lpng1510;../../source/windows_deps/jpeg-8a;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;../../source/windows_deps/ftgl-2.1.3-rc5/src;../../source/windows_deps/freetype-2.4.4/include;../../source/windows_deps/glew-1.7.0/include;../../source/shared_lib/include/graphics/md5;../../source/shared_lib/include/streflop/softfloat;../../source/shared_lib/include/xml/rapidxml;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/platform/win32;../../source/windows_deps/vlc-2.1.2/include;../../source/windows_deps/fribidi-0.19.5/lib;../../source/windows_deps/fribidi-0.19.5/charset;../../source/shared_lib/include/compression;../../source/shared_lib/sources/
+ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP_XXX;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;HAVE_FRIBIDI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
true
Async
MultiThreaded
@@ -174,17 +174,7 @@
CompileAsC
-
-
-
-
-
-
-
-
-
-
diff --git a/mk/windoze/vc2012/shared_lib.vcxproj b/mk/windoze/vc2012/shared_lib.vcxproj
index 72e45784..98417a5f 100644
--- a/mk/windoze/vc2012/shared_lib.vcxproj
+++ b/mk/windoze/vc2012/shared_lib.vcxproj
@@ -105,8 +105,8 @@
Disabled
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/graphics/freetype-gl;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
- WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;%(PreprocessorDefinitions)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
+ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;%(PreprocessorDefinitions)
true
true
EnableFastChecks
@@ -136,8 +136,8 @@
Disabled
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/graphics/freetype-gl;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
- WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;%(PreprocessorDefinitions)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
+ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;%(PreprocessorDefinitions)
true
EnableFastChecks
true
@@ -171,8 +171,8 @@
true
Speed
false
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/graphics/freetype-gl;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/windows_deps_2012/fribidi-0.19.5/lib;../../../source/windows_deps_2012/fribidi-0.19.5/charset;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
- WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;HAVE_FRIBIDI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/windows_deps_2012/fribidi-0.19.5/lib;../../../source/windows_deps_2012/fribidi-0.19.5/charset;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
+ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC;HAVE_FRIBIDI;HAVE_GOOGLE_BREAKPAD;%(PreprocessorDefinitions)
true
Async
MultiThreaded
@@ -201,8 +201,8 @@
true
Speed
false
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/graphics/freetype-gl;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/windows_deps_2012/fribidi-0.19.5/lib;../../../source/windows_deps_2012/fribidi-0.19.5/charset;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
- WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP_XXX;STREFLOP_SSE_XXX;STREFLOP_RANDOM_GEN_SIZE_XXX=32;LIBM_COMPILING_FLT32_XXX;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL_XXX;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC_XXX;HAVE_FRIBIDI;HAVE_GOOGLE_BREAKPAD_XXX;%(PreprocessorDefinitions)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/windows_deps_2012/include;../../../source/windows_deps_2012/xerces-c-3.1.1/src;../../../source/windows_deps_2012/xerces-c-3.1.1/src/xercesc/xinclude;../../../source/windows_deps_2012/lpng1510;../../../source/windows_deps_2012/jpeg-8a;../../../source/windows_deps_2012/SDL-1.2.15/include;../../../source/windows_deps_2012/openal-soft-1.14/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2012/curl-7.21.3/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../../../source/windows_deps_2012/ftgl-2.1.3-rc5/src;../../../source/windows_deps_2012/freetype-2.4.4/include;../../../source/windows_deps_2012/glew-1.7.0/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/windows_deps_2012/vlc-2.0.1/include;../../../source/windows_deps_2012/fribidi-0.19.5/lib;../../../source/windows_deps_2012/fribidi-0.19.5/charset;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/
+ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP_XXX;STREFLOP_SSE_XXX;STREFLOP_RANDOM_GEN_SIZE_XXX=32;LIBM_COMPILING_FLT32_XXX;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAS_LIBVLC_XXX;HAVE_FRIBIDI;HAVE_GOOGLE_BREAKPAD_XXX;%(PreprocessorDefinitions)
true
Async
MultiThreaded
@@ -316,17 +316,7 @@
CompileAsC
-
-
-
-
-
-
-
-
-
-
@@ -501,4 +491,4 @@
-
\ No newline at end of file
+
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index ec3587f1..ccad19e3 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -23,9 +23,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
IF(NOT WIN32)
- FIND_PACKAGE(XercesC REQUIRED)
- INCLUDE_DIRECTORIES(${XERCESC_INCLUDE})
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+ IF(WANT_XERCES)
+ FIND_PACKAGE(XercesC REQUIRED)
+ INCLUDE_DIRECTORIES(${XERCESC_INCLUDE})
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+ ENDIF()
# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 13cb6ecf..1c94df63 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -41,11 +41,13 @@ IF(BUILD_MEGAGLEST)
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
ENDIF()
- FIND_PACKAGE(XercesC REQUIRED)
- INCLUDE_DIRECTORIES(${XERCESC_INCLUDE})
- IF(UNIX)
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
- ENDIF()
+ IF(WANT_XERCES)
+ FIND_PACKAGE(XercesC REQUIRED)
+ INCLUDE_DIRECTORIES(${XERCESC_INCLUDE})
+ IF(UNIX)
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+ ENDIF()
+ ENDIF()
FIND_PACKAGE(OpenAL REQUIRED)
INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index c3c22d64..fa9b8ec8 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -6419,7 +6419,6 @@ string Game::saveGame(string name, string path) {
xmlTreeSaveGame.save(replayFile);
}
- //XmlTree xmlTree(XML_XERCES_ENGINE);
XmlTree xmlTree;
xmlTree.init("megaglest-saved-game");
XmlNode *rootNode = xmlTree.getRootNode();
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 35dc70c4..c9ce7ff4 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -262,8 +262,12 @@ static void cleanupProcessObjects() {
std::map const * >* > &list3d = FileReader::getFileReadersMap();
deleteMapValues(list3d.begin(),list3d.end());
+#if defined(WANT_XERCES)
+
XmlIo::getInstance().cleanup();
+#endif
+
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
SystemFlags::globalCleanupHTTP();
@@ -4260,10 +4264,14 @@ int glestMain(int argc, char** argv) {
}
}
+#if defined(WANT_XERCES)
+
if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_XERCES_INFO]) == true) {
printf("XERCES version: %s\n", XERCES_FULLVERSIONDOT);
}
+#endif
+
if( (hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERSION]) == true ||
hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_SDL_INFO]) == true ||
hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_LUA_INFO]) == true ||
@@ -4509,13 +4517,7 @@ int glestMain(int argc, char** argv) {
TextureGl::setEnableATIHacks(enableATIHacks);
}
- if(config.getBool("ForceFTGLFonts","false") == true || hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_FORCE_FTGLFONTS]) == true) {
- ::Shared::Graphics::Font::forceFTGLFonts = true;
- printf("**WARNING** Forcing use of FTGL Fonts\n");
- }
- else {
- Renderer::renderText3DEnabled = config.getBool("Enable3DFontRendering",intToStr(Renderer::renderText3DEnabled).c_str());
- }
+ Renderer::renderText3DEnabled = config.getBool("Enable3DFontRendering",intToStr(Renderer::renderText3DEnabled).c_str());
if(config.getBool("EnableLegacyFonts","false") == true || hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_ENABLE_LEGACYFONTS]) == true) {
::Shared::Graphics::Font::forceLegacyFonts = true;
diff --git a/source/glest_game/menu/menu_state_load_game.cpp b/source/glest_game/menu/menu_state_load_game.cpp
index f2b52e39..08492d94 100644
--- a/source/glest_game/menu/menu_state_load_game.cpp
+++ b/source/glest_game/menu/menu_state_load_game.cpp
@@ -302,10 +302,15 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
if(fileExists(filename) == true) {
// Xerces is infinitely slower than rapidxml
xml_engine_parser_type engine_type = XML_RAPIDXML_ENGINE;
+
+#if defined(WANT_XERCES)
+
if(Config::getInstance().getBool("ForceXMLLoadGameUsingXerces","false") == true) {
engine_type = XML_XERCES_ENGINE;
}
- // XmlTree xmlTree(XML_XERCES_ENGINE);
+
+#endif
+
XmlTree xmlTree(engine_type);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Before load of XML\n");
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 2bc60d9b..75663f32 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -94,11 +94,14 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF)
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
ENDIF()
- FIND_PACKAGE(XercesC REQUIRED)
- INCLUDE_DIRECTORIES(${XERCESC_INCLUDE_DIR})
- IF(UNIX)
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
- ENDIF()
+
+ IF(WANT_XERCES)
+ FIND_PACKAGE(XercesC REQUIRED)
+ INCLUDE_DIRECTORIES(${XERCESC_INCLUDE_DIR})
+ IF(UNIX)
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+ ENDIF()
+ ENDIF()
FIND_PACKAGE(OpenAL REQUIRED)
INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
@@ -147,7 +150,6 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF)
ENDIF()
OPTION(USE_FTGL "Use FTGL for on-screen fonts (found on your system)" ON)
-
if(USE_FTGL)
ADD_DEFINITIONS(-DUSE_FTGL)
@@ -156,8 +158,6 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF)
endif(USE_FTGL)
- #INCLUDE(FindPkgConfig.cmake)
- #pkg_search_module (FTGL ftgl)
FIND_PACKAGE(FTGL)
@@ -187,11 +187,6 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF)
ENDIF(USE_FTGL)
- OPTION(USE_FREETYPEGL "Use Freetype-GL for on-screen fonts" OFF)
- if(USE_FREETYPEGL)
- ADD_DEFINITIONS(-DUSE_FREETYPEGL)
- endif(USE_FREETYPEGL)
-
FIND_PACKAGE(Freetype REQUIRED)
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_PATH})
IF(UNIX)
@@ -264,9 +259,7 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF)
feathery_ftp
glew
graphics
- graphics/freetype-gl
graphics/gl
- graphics/iqm
lua
map
platform/common
diff --git a/source/shared_lib/include/graphics/d3d9/context_d3d9.h b/source/shared_lib/include/graphics/d3d9/context_d3d9.h
deleted file mode 100644
index f8b1e925..00000000
--- a/source/shared_lib/include/graphics/d3d9/context_d3d9.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// This file is part of MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2012 Mark Vejvoda
-//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
-
-#ifndef _SHARED_D3D9_DEVICECONTEXTD3D9_H_
-#define _SHARED_D3D9_DEVICECONTEXTD3D9_H_
-
-#include "context.h"
-
-#include
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-// ===============================
-// class ContextD3d9
-// ===============================
-
-class ContextD3d9: public Context{
-private:
- bool windowed;
- bool hardware;
-
- IDirect3D9 *d3dObject;
- IDirect3DDevice9 *d3dDevice;
- D3DCAPS9 caps;
- D3DPRESENT_PARAMETERS d3dPresentParameters;
-
-public:
- bool getWindowed() const {return windowed;}
- bool getHardware() const {return hardware;}
-
- void setWindowed(bool windowed) {this->windowed= windowed;}
- void setHardware(bool hardware) {this->hardware= hardware;}
-
- ContextD3d9();
-
- virtual void init();
- virtual void end();
- virtual void reset();
-
- virtual void makeCurrent();
- virtual void swapBuffers();
-
- const D3DCAPS9 *getCaps() const {return ∩︀};
-
-
- IDirect3DDevice9 *getD3dDevice() {return d3dDevice;}
-};
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/d3d9/d3d9_util.h b/source/shared_lib/include/graphics/d3d9/d3d9_util.h
deleted file mode 100644
index a529a711..00000000
--- a/source/shared_lib/include/graphics/d3d9/d3d9_util.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// ==============================================================
-// This file is part of MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke
-// The Megaglest Team, under GNU GPL v3.0
-// ==============================================================
-
-#ifndef _SHARED_D3D9_D3D9UTIL_H_
-#define _SHARED_D3D9_D3D9UTIL_H_
-
-#include
-
-#include
-#include
-
-#define D3DCALL(X) checkResult(X, #X);
-
-using std::string;
-using std::runtime_error;
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-string d3dErrorToStr(HRESULT result);
-
-inline void checkResult(HRESULT result, const string &functionCall){
- if(result!=D3D_OK){
- throw megaglest_runtime_error("Direct3D Error\nCode: " + d3dErrorToStr(result) + "\nFunction: " + functionCall);
- }
-}
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/d3d9/font_d3d9.h b/source/shared_lib/include/graphics/d3d9/font_d3d9.h
deleted file mode 100644
index 89db4340..00000000
--- a/source/shared_lib/include/graphics/d3d9/font_d3d9.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// ==============================================================
-// This file is part of MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke
-// The Megaglest Team, under GNU GPL v3.0
-// ==============================================================
-
-#ifndef _SHARED_D3D9_FONTD3D9_H_
-#define _SHARED_D3D9_FONTD3D9_H_
-
-#include "font.h"
-
-#include
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-// ===============================
-// class FontD3d9
-// ===============================
-
-class Font2DD3d9: public Font2D{
-private:
- LPD3DXFONT d3dFont;
-
-public:
- LPD3DXFONT getD3dFont() const {return d3dFont;}
- virtual void init();
- virtual void end();
-};
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/d3d9/graphics_factory_d3d9.h b/source/shared_lib/include/graphics/d3d9/graphics_factory_d3d9.h
deleted file mode 100644
index f3002cbf..00000000
--- a/source/shared_lib/include/graphics/d3d9/graphics_factory_d3d9.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
-//
-// Copyright (C) 2001-2008 Martiño Figueroa
-//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
-
-#ifndef _SHARED_D3D9_GRAPHICSFACTORYD3D9_H_
-#define _SHARED_D3D9_GRAPHICSFACTORYD3D9_H_
-
-#include "context_d3d9.h"
-#include "model_renderer_d3d9.h"
-#include "texture_d3d9.h"
-#include "font_d3d9.h"
-#include "text_renderer_d3d9.h"
-#include "shader_d3d9.h"
-#include "graphics_factory.h"
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-// ===============================
-// class GraphicsFactoryD3d9
-// ===============================
-
-class GraphicsFactoryD3d9: public GraphicsFactory{
-public:
- virtual TextRenderer2D *newTextRenderer2D() {return new TextRenderer2DD3d9();}
- virtual ModelRenderer *newModelRenderer() {return NULL;}
- virtual Context *newContext() {return new ContextD3d9();}
- virtual Texture2D *newTexture2D() {return new Texture2DD3d9();}
- virtual TextureCube *newTextureCube() {return new TextureCubeD3d9();}
- virtual Font2D *newFont2D() {return new Font2DD3d9();}
- virtual ShaderProgram *newShaderProgram() {return new ShaderProgramD3d9();}
- virtual VertexShader *newVertexShader() {return new VertexShaderD3d9();}
- virtual FragmentShader *newFragmentShader() {return new PixelShaderD3d9();}
-};
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/d3d9/model_renderer_d3d9.h b/source/shared_lib/include/graphics/d3d9/model_renderer_d3d9.h
deleted file mode 100644
index d70bcdbd..00000000
--- a/source/shared_lib/include/graphics/d3d9/model_renderer_d3d9.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// ==============================================================
-// This file is part of MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke
-// The Megaglest Team, under GNU GPL v3.0
-// ==============================================================
-
-#ifndef _SHARED_D3D9_MODELRENDERERD3D9_H_
-#define _SHARED_D3D9_MODELRENDERERD3D9_H_
-
-#include "model_renderer.h"
-#include "model.h"
-
-#include
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-// ===============================
-// class ModelRendererD3d9
-// ===============================
-
-class ModelRendererD3d9: public ModelRenderer{
-private:
- static const int defBufferPointCount= 100; //buffer size in vertices
- static const int defBufferIndexCount= 100; //buffer size in vertices
-
- struct CustomVertexPNTT{
- Vec3f vertex;
- Vec3f normal;
- Vec2f texCoord;
- Vec3f tangent;
- };
-
-private:
- bool rendering;
- int bufferPointCount;
- int bufferIndexCount;
-
- IDirect3DDevice9 *d3dDevice;
- IDirect3DVertexBuffer9 *d3dVertexBuffer;
- IDirect3DIndexBuffer9 *d3dIndexBuffer;
- IDirect3DVertexDeclaration9 *d3dVertexDeclarationPNT;
- IDirect3DVertexDeclaration9 *d3dVertexDeclarationPNTT;
-
-public:
- ModelRendererD3d9();
- ~ModelRendererD3d9();
- virtual void begin(bool renderNormals= true, bool renderTextures= true, bool renderColors= true);
- virtual void end();
- virtual void render(const Model *model);
- virtual void renderNormalsOnly(const Model *model);
-
-private:
- void renderMesh(const Mesh *mesh);
- void readyBuffers(int newPointCount, int newIndexCount);
-};
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/d3d9/shader_d3d9.h b/source/shared_lib/include/graphics/d3d9/shader_d3d9.h
deleted file mode 100644
index 7b5b351d..00000000
--- a/source/shared_lib/include/graphics/d3d9/shader_d3d9.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// ==============================================================
-// This file is part of MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke
-// The Megaglest Team, under GNU GPL v3.0
-// ==============================================================
-
-#ifndef _SHARED_D3D9_SHADERD3D9_H_
-#define _SHARED_D3D9_SHADERD3D9_H_
-
-#include "shader.h"
-#include "vec.h"
-
-#include
-#include
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-// ===============================
-// class ShaderProgramD3d9
-// ===============================
-
-class VertexShaderD3d9;
-class PixelShaderD3d9;
-
-class ShaderProgramD3d9: public virtual ShaderProgram{
-protected:
- IDirect3DDevice9 *d3dDevice;
- ID3DXConstantTable *d3dVsConstantTable;
- ID3DXConstantTable *d3dPsConstantTable;
-
- VertexShaderD3d9 *vertexShader;
- PixelShaderD3d9 *pixelShader;
-
-public:
- ShaderProgramD3d9();
-
- virtual void init(){};
- virtual void end(){};
-
- virtual void attach(VertexShader *vs, FragmentShader *fs);
- virtual void activate();
-
- virtual bool link(string &messages);
-
- virtual void setUniform(const string &name, int value);
- virtual void setUniform(const string &name, float value);
- virtual void setUniform(const string &name, const Vec2f &value);
- virtual void setUniform(const string &name, const Vec3f &value);
- virtual void setUniform(const string &name, const Vec4f &value);
- virtual void setUniform(const string &name, const Matrix3f &value);
- virtual void setUniform(const string &name, const Matrix4f &value);
- //virtual void setUniform(const string &name, const Texture *value);
-};
-
-
-// ===============================
-// class ShaderD3d9
-// ===============================
-
-class ShaderD3d9: virtual public Shader{
-protected:
- ShaderSource source;
- string target;
-
- IDirect3DDevice9 *d3dDevice;
- ID3DXConstantTable *d3dConstantTable;
-
-public:
- ShaderD3d9();
- virtual void init(){};
- virtual void end();
- virtual void load(const string &path);
-
- ID3DXConstantTable *getD3dConstantTable() const {return d3dConstantTable;}
-
- void setTarget(const string &target) {this->target= target;}
-};
-
-// ===============================
-// class VertexShaderD3d9
-// ===============================
-
-class VertexShaderD3d9: public ShaderD3d9, public VertexShader{
-private:
- IDirect3DVertexShader9 *d3dVertexShader;
-
-public:
- VertexShaderD3d9();
- virtual void end();
-
- virtual bool compile(string &messages);
-
- IDirect3DVertexShader9 *getD3dVertexShader() const {return d3dVertexShader;}
-};
-
-// ===============================
-// class PixelShaderD3d9
-// ===============================
-
-class PixelShaderD3d9: public ShaderD3d9, public FragmentShader{
-private:
- IDirect3DPixelShader9 *d3dPixelShader;
-
-public:
- PixelShaderD3d9();
- virtual void end();
-
- virtual bool compile(string &messages);
-
- IDirect3DPixelShader9 *getD3dPixelShader() const {return d3dPixelShader;}
-};
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/d3d9/text_renderer_d3d9.h b/source/shared_lib/include/graphics/d3d9/text_renderer_d3d9.h
deleted file mode 100644
index 29037a5c..00000000
--- a/source/shared_lib/include/graphics/d3d9/text_renderer_d3d9.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// ==============================================================
-// This file is part of MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke
-// The Megaglest Team, under GNU GPL v3.0
-// ==============================================================
-
-#ifndef _SHARED_D3D9_TEXTRENDERERD3D9_H_
-#define _SHARED_D3D9_TEXTRENDERERD3D9_H_
-
-#include "text_renderer.h"
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-// ===============================
-// class TextRenderer2DD3d9
-// ===============================
-
-class TextRenderer2DD3d9: public TextRenderer2D{
-private:
- const Font *font;
- Vec4f color;
-
-public:
- virtual void begin(const Font2D *font);
- virtual void render(const string &text, int x, int y, bool centered= false);
- virtual void end();
-};
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/d3d9/texture_d3d9.h b/source/shared_lib/include/graphics/d3d9/texture_d3d9.h
deleted file mode 100644
index 48823752..00000000
--- a/source/shared_lib/include/graphics/d3d9/texture_d3d9.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// ==============================================================
-// This file is part of MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke
-// The Megaglest Team, under GNU GPL v3.0
-// ==============================================================
-
-#ifndef _SHARED_D3D9_TEXTURED3D9_H_
-#define _SHARED_D3D9_TEXTURED3D9_H_
-
-#include "texture.h"
-#include
-
-namespace Shared{ namespace Graphics{ namespace D3d9{
-
-// ===============================
-// class Texture2DD3d9
-// ===============================
-
-class Texture2DD3d9: public Texture2D{
-private:
- IDirect3DTexture9 *d3dTexture;
-
-public:
- IDirect3DTexture9 *getD3dTexture() const {return d3dTexture;}
-
- virtual void init(Filter textureFilter, int maxAnisotropy= 1);
- virtual void end();
-};
-
-// ===============================
-// class TextureCubeD3d9
-// ===============================
-
-class TextureCubeD3d9: public TextureCube{
-private:
- IDirect3DCubeTexture9 *d3dCubeTexture;
-
-public:
- IDirect3DCubeTexture9 *getD3dCubeTexture() const {return d3dCubeTexture;}
-
- virtual void init(Filter textureFilter, int maxAnisotropy= 1);
- virtual void end();
-};
-
-}}}//end namespace
-
-#endif
diff --git a/source/shared_lib/include/graphics/font.h b/source/shared_lib/include/graphics/font.h
index ae28ccb3..f1aa785c 100644
--- a/source/shared_lib/include/graphics/font.h
+++ b/source/shared_lib/include/graphics/font.h
@@ -68,7 +68,6 @@ public:
static std::string fontTypeName;
static bool fontIsMultibyte;
static bool forceLegacyFonts;
- static bool forceFTGLFonts;
static bool fontIsRightToLeft;
static bool fontSupportMixedRightToLeft;
static float scaleFontValue;
diff --git a/source/shared_lib/include/graphics/freetype-gl/edtaa3func.h b/source/shared_lib/include/graphics/freetype-gl/edtaa3func.h
deleted file mode 100644
index 44210efe..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/edtaa3func.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2009 Stefan Gustavson (stefan.gustavson@gmail.com)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY STEFAN GUSTAVSON ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL STEFAN GUSTAVSON OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Stefan Gustavson.
- *
- *
- * edtaa3()
- *
- * Sweep-and-update Euclidean distance transform of an
- * image. Positive pixels are treated as object pixels,
- * zero or negative pixels are treated as background.
- * An attempt is made to treat antialiased edges correctly.
- * The input image must have pixels in the range [0,1],
- * and the antialiased image should be a box-filter
- * sampling of the ideal, crisp edge.
- * If the antialias region is more than 1 pixel wide,
- * the result from this transform will be inaccurate.
- *
- * By Stefan Gustavson (stefan.gustavson@gmail.com).
- *
- * Originally written in 1994, based on a verbal
- * description of the SSED8 algorithm published in the
- * PhD dissertation of Ingemar Ragnemalm. This is his
- * algorithm, I only implemented it in C.
- *
- * Updated in 2004 to treat border pixels correctly,
- * and cleaned up the code to improve readability.
- *
- * Updated in 2009 to handle anti-aliased edges.
- *
- * Updated in 2011 to avoid a corner case infinite loop.
- *
- */
-
-#ifdef USE_FREETYPEGL
-
-#include
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
- * Compute the local gradient at edge pixels using convolution filters.
- * The gradient is computed only at edge pixels. At other places in the
- * image, it is never used, and it's mostly zero anyway.
- */
-void computegradient(double *img, int w, int h, double *gx, double *gy);
-
-/*
- * A somewhat tricky function to approximate the distance to an edge in a
- * certain pixel, with consideration to either the local gradient (gx,gy)
- * or the direction to the pixel (dx,dy) and the pixel greyscale value a.
- * The latter alternative, using (dx,dy), is the metric used by edtaa2().
- * Using a local estimate of the edge gradient (gx,gy) yields much better
- * accuracy at and near edges, and reduces the error even at distant pixels
- * provided that the gradient direction is accurately estimated.
- */
-double edgedf(double gx, double gy, double a);
-
-
-double distaa3(double *img, double *gximg, double *gyimg, int w, int c, int xc, int yc, int xi, int yi);
-
-// Shorthand macro: add ubiquitous parameters dist, gx, gy, img and w and call distaa3()
-#define DISTAA(c,xc,yc,xi,yi) (distaa3(img, gx, gy, w, c, xc, yc, xi, yi))
-
-void edtaa3(double *img, double *gx, double *gy, int w, int h, short *distx, short *disty, double *dist);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/source/shared_lib/include/graphics/freetype-gl/font-manager.h b/source/shared_lib/include/graphics/freetype-gl/font-manager.h
deleted file mode 100644
index e16db2da..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/font-manager.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* =========================================================================
- * Freetype GL - A C OpenGL Freetype engine
- * Platform: Any
- * WWW: http://code.google.com/p/freetype-gl/
- * -------------------------------------------------------------------------
- * Copyright 2011 Nicolas P. Rougier. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NICOLAS P. ROUGIER ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL NICOLAS P. ROUGIER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Nicolas P. Rougier.
- * ========================================================================= */
-
-#ifdef USE_FREETYPEGL
-
-#pragma once
-#ifndef __FONT_MANAGER_H__
-#define __FONT_MANAGER_H__
-
-#include "vector.h"
-#include "markup.h"
-#include "texture-font.h"
-#include "texture-atlas.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- *
- */
-typedef struct {
- TextureAtlas * atlas;
- Vector * fonts;
- wchar_t * cache;
- Region black;
-} FontManager;
-
-
-
-/**
- *
- */
- FontManager *
- font_manager_new( size_t width, size_t height, size_t depth );
-
-
-/**
- *
- */
- void
- font_manager_delete( FontManager *self );
-
-
-/**
- *
- */
- TextureFont *
- font_manager_get_from_filename( FontManager * self,
- const char * filename,
- const float size );
-
-
-/**
- *
- */
- TextureFont *
- font_manager_get_from_description( FontManager * self,
- const char * family,
- const float size,
- const int bold,
- const int italic );
-
-
-/**
- *
- */
- TextureFont *
- font_manager_get_from_markup( FontManager *self,
- const Markup *markup );
-
-
-/**
- *
- */
- char *
- font_manager_match_description( FontManager * self,
- const char * family,
- const float size,
- const int bold,
- const int italic );
-
-
-/**
- *
- */
- const wchar_t *
- font_manager_get_cache( FontManager * self );
-
-
-/**
- *
- */
- void
- font_manager_set_cache( FontManager * self,
- const wchar_t * cache );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __FONT_MANAGER_H__ */
-
-#endif
diff --git a/source/shared_lib/include/graphics/freetype-gl/markup.h b/source/shared_lib/include/graphics/freetype-gl/markup.h
deleted file mode 100644
index 11e0cfbf..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/markup.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* =========================================================================
- * Freetype GL - A C OpenGL Freetype engine
- * Platform: Any
- * WWW: http://code.google.com/p/freetype-gl/
- * -------------------------------------------------------------------------
- * Copyright 2011 Nicolas P. Rougier. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NICOLAS P. ROUGIER ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL NICOLAS P. ROUGIER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Nicolas P. Rougier.
- * ========================================================================= */
-
-#ifdef USE_FREETYPEGL
-
-#pragma once
-#ifndef __MARKUP_H__
-#define __MARKUP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
- float r,g,b,a;
-} Color;
-
-typedef struct
-{
- char * family;
- float size;
- int bold;
- int italic;
- float rise;
- float spacing;
- Color foreground_color;
- Color background_color;
- int outline;
- Color outline_color;
- int underline;
- Color underline_color;
- int overline;
- Color overline_color;
- int strikethrough;
- Color strikethrough_color;
- struct TextureFont_ * font;
-} Markup;
-
-
-Markup * markup_new( void );
-Markup * markup_copy( const Markup *other );
-
-
-int markup_cmp( const Markup *self,
- const Markup *other );
-
-void markup_delete( Markup *self );
-const char * markup_get_family( Markup *self );
-void markup_set_family( Markup *self,
- const char *family );
-int markup_get_italic( Markup *self );
-void markup_set_italic( Markup *self,
- const int italic );
-int markup_get_bold( Markup *self );
-void markup_set_bold( Markup *self,
- const int bold );
-float markup_get_size( Markup *self );
-void markup_set_size( Markup *self,
- const float size );
-float markup_get_rise( Markup *self );
-void markup_set_rise( Markup *self,
- const float rise );
-float markup_get_spacing( Markup *self );
-void markup_set_spacing( Markup *self,
- const float spacing );
-Color markup_get_foreground_color( Markup *self );
-void markup_set_foreground_color( Markup *self,
- const Color * color );
-Color markup_get_background_color( Markup *self );
-void markup_set_background_color( Markup *self,
- const Color * color );
-int markup_get_outline( Markup *self );
-void markup_set_outline( Markup *self,
- const int outline );
-Color markup_get_outline_color( Markup *self );
-void markup_set_outline_color( Markup *self,
- const Color * color );
-int markup_get_underline( Markup *self );
-void markup_set_underline( Markup *self,
- const int underline );
-Color markup_get_underline_color( Markup *self );
-void markup_set_underline_color( Markup *self,
- const Color * color );
-int markup_get_overline( Markup *self );
-void markup_set_overline( Markup *self,
- const int overline );
-Color markup_get_overline_color( Markup *self );
-void markup_set_overline_color( Markup *self,
- const Color * color );
-int markup_get_strikethrough( Markup *self );
-void markup_set_strikethrough( Markup *self,
- const int strikethrough );
-Color markup_get_strikethrough_color( Markup *self );
-void markup_set_strikethrough_color( Markup *self,
- const Color * color );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MARKUP_H__ */
-
-#endif
diff --git a/source/shared_lib/include/graphics/freetype-gl/texture-atlas.h b/source/shared_lib/include/graphics/freetype-gl/texture-atlas.h
deleted file mode 100644
index f5090f90..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/texture-atlas.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* =========================================================================
- * Freetype GL - A C OpenGL Freetype engine
- * Platform: Any
- * WWW: http://code.google.com/p/freetype-gl/
- * -------------------------------------------------------------------------
- * Copyright 2011 Nicolas P. Rougier. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NICOLAS P. ROUGIER ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL NICOLAS P. ROUGIER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Nicolas P. Rougier.
- * =========================================================================
-
- This source is based on the article by Jukka Jylänki :
- "A Thousand Ways to Pack the Bin - A Practical Approach to
- Two-Dimensional Rectangle Bin Packing", February 27, 2010.
-
- More precisely, this is an implementation of the Skyline Bottom-Left
- algorithm based on C++ sources provided by Jukka Jylänki at:
- http://clb.demon.fi/files/RectangleBinPack/
-
- ========================================================================= */
-
-#ifdef USE_FREETYPEGL
-
-#pragma once
-#ifndef __TEXTURE_ATLAS_H__
-#define __TEXTURE_ATLAS_H__
-#include "vector.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * A Region describes
- *
- *
- */
-typedef struct
-{
- int x;
- int y;
- int width;
- int height;
-} Region;
-
-
-typedef struct { float x,y,z,w; } vec4;
-typedef struct { float x,y,z; } vec3;
-typedef struct { float x,y; } vec2;
-typedef struct { int x,y,z,w; } ivec4;
-typedef struct { int x,y,z; } ivec3;
-typedef struct { int x,y; } ivec2;
-
-
-typedef struct
-{
- /** Current allocated nodes */
- Vector *nodes;
-
- /** Width (in pixels) of the underlying texture */
- size_t width;
-
- /** Height (in pixels) of the underlying texture */
- size_t height;
-
- /** Texture format (1, 3 or 4) */
- size_t depth;
-
- /** Allocated surface */
- size_t used;
-
- /** Texture identity (OpenGL) */
- unsigned int texid;
-
- unsigned char *data;
-
- /** A special region */
- Region black;
-
-} TextureAtlas;
-
-
-/**
- *
- */
- TextureAtlas *
- texture_atlas_new( size_t width,
- size_t height,
- size_t depth );
-
-
-/**
- *
- */
- void
- texture_atlas_delete( TextureAtlas *self );
-
-
-/**
- *
- */
- void
- texture_atlas_upload( TextureAtlas *self );
-
-
-/**
- *
- */
- Region
- texture_atlas_get_region( TextureAtlas *self,
- size_t width,
- size_t height );
-
-
-/**
- *
- */
- void
- texture_atlas_set_region( TextureAtlas *self,
- size_t x,
- size_t y,
- size_t width,
- size_t height,
- unsigned char *data,
- size_t stride );
-
-/**
- *
- */
- void
- texture_atlas_clear( TextureAtlas *self );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TEXTURE_ATLAS_H__ */
-
-#endif
diff --git a/source/shared_lib/include/graphics/freetype-gl/texture-font.h b/source/shared_lib/include/graphics/freetype-gl/texture-font.h
deleted file mode 100644
index c5d1a76e..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/texture-font.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* =========================================================================
- * Freetype GL - A C OpenGL Freetype engine
- * Platform: Any
- * WWW: http://code.google.com/p/freetype-gl/
- * -------------------------------------------------------------------------
- * Copyright 2011 Nicolas P. Rougier. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NICOLAS P. ROUGIER ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL NICOLAS P. ROUGIER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Nicolas P. Rougier.
- * ========================================================================= */
-
-#ifdef USE_FREETYPEGL
-
-#pragma once
-#ifndef __TEXTURE_FONT_H__
-#define __TEXTURE_FONT_H__
-
-#include
-#include FT_FREETYPE_H
-#include "vector.h"
-#include "texture-atlas.h"
-#include "texture-glyph.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *
- */
-struct TextureFont_
-{
- Vector * glyphs;
- TextureAtlas * atlas;
- char * filename;
- int bold;
- int italic;
- float size;
- float gamma;
- Region black;
- int antialias;
- int subpixel;
- int hinting;
- float height;
- float linegap;
- float ascender;
- float descender;
- int lcd_filter;
- unsigned char lcd_weights[5];
-};
-typedef struct TextureFont_ TextureFont;
-
-
-
-/**
- *
- */
- TextureFont *
- texture_font_new( TextureAtlas * atlas,
- const char * filename,
- const float size );
-
-
-/**
- *
- */
- void
- texture_font_delete( TextureFont * self );
-
-
-/**
- *
- */
- TextureGlyph *
- texture_font_get_glyph( TextureFont * self,
- wchar_t charcode );
-
-
-/**
- *
- */
- size_t
- texture_font_cache_glyphs( TextureFont * self,
- const wchar_t * charcodes );
-
-
-/**
- *
- */
- int
- texture_font_load_face( FT_Library * library,
- const char * filename,
- const float size,
- FT_Face * face );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TEXTURE_FONT_H__ */
-
-#endif
diff --git a/source/shared_lib/include/graphics/freetype-gl/texture-glyph.h b/source/shared_lib/include/graphics/freetype-gl/texture-glyph.h
deleted file mode 100644
index 4a3e3e53..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/texture-glyph.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* =========================================================================
- * Freetype GL - A C OpenGL Freetype engine
- * Platform: Any
- * WWW: http://code.google.com/p/freetype-gl/
- * -------------------------------------------------------------------------
- * Copyright 2011 Nicolas P. Rougier. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NICOLAS P. ROUGIER ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL NICOLAS P. ROUGIER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Nicolas P. Rougier.
- * ========================================================================= */
-
-#ifdef USE_FREETYPEGL
-
-#pragma once
-#ifndef __TEXTURE_GLYPH_H__
-#define __TEXTURE_GLYPH_H__
-
-#include
-#include "markup.h"
-#include "vertex-buffer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *
- */
-typedef struct {
- wchar_t charcode;
- float kerning;
-} KerningPair;
-
-
-/**
- *
- */
-typedef struct {
- float x,y;
-} Pen;
-
-
-/**
- *
- */
-typedef struct {
- wchar_t charcode;
- int width, height;
- int offset_x, offset_y;
- float advance_x, advance_y;
- float u0, v0, u1, v1;
- KerningPair * kerning;
- size_t kerning_count;
- struct TextureFont_ *font;
-} TextureGlyph;
-
-
-/**
- *
- */
-typedef struct {
- float x, y, z;
- float u, v;
- float r, g, b, a;
-} TextureGlyphVertex;
-
-
-/**
- *
- */
- TextureGlyph *
- texture_glyph_new( void );
-
-
-/**
- *
- */
- void
- texture_glyph_delete( TextureGlyph * self );
-
-
-/**
- *
- */
- void
- texture_glyph_render( TextureGlyph * self,
- Markup * markup,
- Pen * pen );
-
-
-/**
- *
- */
- void
- texture_glyph_add_to_vertex_buffer( const TextureGlyph * self,
- VertexBuffer * buffer,
- const Markup * markup,
- Pen * pen, int kerning );
-
-
-/**
- *
- */
- float
- texture_glyph_get_kerning( TextureGlyph * self,
- wchar_t charcode );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TEXTURE_GLYPH_H__ */
-
-#endif
diff --git a/source/shared_lib/include/graphics/freetype-gl/vector.h b/source/shared_lib/include/graphics/freetype-gl/vector.h
deleted file mode 100644
index 3012116f..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/vector.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/* =========================================================================
- * Freetype GL - A C OpenGL Freetype engine
- * Platform: Any
- * WWW: http://code.google.com/p/freetype-gl/
- * -------------------------------------------------------------------------
- * Copyright 2011 Nicolas P. Rougier. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NICOLAS P. ROUGIER ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL NICOLAS P. ROUGIER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Nicolas P. Rougier.
- * ========================================================================= */
-#ifdef USE_FREETYPEGL
-
-#ifndef __VECTOR_H__
-#define __VECTOR_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * Generic vector structure.
- */
-typedef struct
- {
- /** Pointer to dynamically allocated items. */
- void * items;
-
- /** Number of items that can be held in currently allocated storage. */
- size_t capacity;
-
- /** Number of items. */
- size_t size;
-
- /** Size (in bytes) of a single item. */
- size_t item_size;
-} Vector;
-
-/**
- * Creates a vector.
- *
- * @param item_size item size in bytes
- * @return a new empty vector
- */
- Vector *
- vector_new( size_t item_size );
-
-/**
- * Deletes a vector.
- *
- * @param self a vector structure
- */
- void
- vector_delete( Vector *self );
-
-/**
- * Returns a pointer to the item located at specified index.
- *
- * @param self a vector structure
- * @param index the index of the item to be returned
- * @return pointer on the specified item
- */
- const void *
- vector_get( const Vector *self,
- size_t index );
-
-/**
- * Returns a pointer to the first item.
- *
- * @param self a vector structure
- * @return pointer on the first item
- */
- const void *
- vector_front( const Vector *self );
-
-/**
- * Returns a pointer to the last item
- *
- * @param self a vector structure
- * @return pointer on the last item
- */
- const void *
- vector_back( const Vector *self );
-
-/**
- * Check if an item is contained within the vector.
- *
- * @param self a vector structure
- * @param item item to be searched in the vector
- * @param cmp a pointer a comparison function
- * @return 1 if item is contained within the vector, 0 otherwise
- */
- int
- vector_contains( const Vector *self,
- const void *item,
- int (*cmp)(const void *, const void *) );
-
-/**
- * Checks whether the vector is empty.
- *
- * @param self a vector structure
- * @return 1 if the vector is empty, 0 otherwise
- */
- int
- vector_empty( const Vector *self );
-
-/**
- * Returns the number of items
- *
- * @param self a vector structure
- * @return number of items
- */
- size_t
- vector_size( const Vector *self );
-
-/**
- * Reserve storage such that it can hold at last size items.
- *
- * @param self a vector structure
- * @param size the new storage capacity
- */
- void
- vector_reserve( Vector *self,
- const size_t size );
-
-/**
- * Returns current storage capacity
- *
- * @param self a vector structure
- * @return storage capacity
- */
- size_t
- vector_capacity( const Vector *self );
-
-/**
- * Decrease capacity to fit actual size.
- *
- * @param self a vector structure
- */
- void
- vector_shrink( Vector *self );
-
-/**
- * Removes all items.
- *
- * @param self a vector structure
- */
- void
- vector_clear( Vector *self );
-
-/**
- * Replace an item.
- *
- * @param self a vector structure
- * @param index the index of the item to be replaced
- * @param item the new item
- */
- void
- vector_set( Vector *self,
- const size_t index,
- const void *item );
-
-/**
- * Erase an item.
- *
- * @param self a vector structure
- * @param index the index of the item to be erased
- */
- void
- vector_erase( Vector *self,
- const size_t index );
-
-/**
- * Erase a range of items.
- *
- * @param self a vector structure
- * @param first the index of the first item to be erased
- * @param last the index of the last item to be erased
- */
- void
- vector_erase_range( Vector *self,
- const size_t first,
- const size_t last );
-
-/**
- * Appends given item to the end of the vector.
- *
- * @param self a vector structure
- * @param item the item to be inserted
- */
- void
- vector_push_back( Vector *self,
- const void *item );
-
-/**
- * Removes the last item of the vector.
- *
- * @param self a vector structure
- */
- void
- vector_pop_back( Vector *self );
-
-/**
- * Resizes the vector to contain size items
- *
- * If the current size is less than size, additional items are appended and
- * initialized with value. If the current size is greater than size, the
- * vector is reduced to its first size elements.
- *
- * @param self a vector structure
- * @param size the new size
- */
- void
- vector_resize( Vector *self,
- const size_t size );
-
-/**
- * Insert a single item at specified index.
- *
- * @param self a vector structure
- * @param index location before which to insert item
- * @param item the item to be inserted
- */
- void
- vector_insert( Vector *self,
- const size_t index,
- const void *item );
-
-/**
- * Insert raw data at specified index.
- *
- * @param self a vector structure
- * @param index location before which to insert item
- * @param data a pointer to the items to be inserted
- * @param count the number of items to be inserted
- */
- void
- vector_insert_data( Vector *self,
- const size_t index,
- const void * data,
- const size_t count );
-
-/**
- * Append raw data to the end of the vector.
- *
- * @param self a vector structure
- * @param data a pointer to the items to be inserted
- * @param count the number of items to be inserted
- */
- void
- vector_push_back_data( Vector *self,
- const void * data,
- const size_t count );
-
-/**
- * Sort vector items according to cmp function.
- *
- * @param self a vector structure
- * @param cmp a pointer a comparison function
- */
- void
- vector_sort( Vector *self,
- int (*cmp)(const void *, const void *) );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __VECTOR_H__ */
-
-#endif
diff --git a/source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h b/source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h
deleted file mode 100644
index 9a5d5157..00000000
--- a/source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/* =========================================================================
- * Freetype GL - A C OpenGL Freetype engine
- * Platform: Any
- * WWW: http://code.google.com/p/freetype-gl/
- * -------------------------------------------------------------------------
- * Copyright 2011 Nicolas P. Rougier. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NICOLAS P. ROUGIER ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL NICOLAS P. ROUGIER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of Nicolas P. Rougier.
- * ========================================================================= */
-
-#ifdef USE_FREETYPEGL
-
-#ifndef __VERTEX_BUFFER_H__
-#define __VERTEX_BUFFER_H__
-
-#if defined(_WIN32)
-
-#define WIN32_LEAN_AND_MEAN
-#include
-#endif
-
-#include
-#include "vector.h"
-
-#define MAX_VERTEX_ATTRIBUTE 64
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Generic vertex attribute.
- */
-typedef struct
-{
- /**
- * a client-side capability.
- */
- GLenum target;
-
- /**
- * a translated client-side capability.
- */
- GLchar ctarget;
-
- /**
- * index of the generic vertex attribute to be modified.
- */
- GLuint index;
-
- /**
- * Number of components per generic vertex attribute. Must be 1, 2, 3, or
- * 4. The initial value is 4.
- */
- GLint size;
-
- /**
- * Data type of each component in the array. Symbolic constants GL_BYTE,
- * GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT,
- * GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
- */
- GLenum type;
-
- /**
- * Whether fixed-point data values should be normalized (GL_TRUE) or
- * converted directly as fixed-point values (GL_FALSE) when they are
- * accessed.
- */
- GLboolean normalized;
-
- /**
- * Byte offset between consecutive generic vertex attributes. If stride is
- * 0, the generic vertex attributes are understood to be tightly packed in
- * the array. The initial value is 0.
- */
- GLsizei stride;
-
- /**
- * Pointer to the first component of the first attribute element in the
- * array.
- */
- GLvoid * pointer;
-
- /** Pointer to the function that enable this attribute. */
- void ( * enable )(void *);
-
-} VertexAttribute;
-
-
-
-/**
- * Generic vertex buffer.
- */
-typedef struct
-{
- /** Format of the vertex buffer. */
- char * format;
-
- /** Vector of vertices. */
- Vector * vertices;
-
- /** GL identity of the vertices buffer. */
- GLuint vertices_id;
-
- /** Vector of indices. */
- Vector * indices;
-
- /** GL identity of the indices buffer. */
- GLuint indices_id;
-
- /** Whether the vertex buffer needs to be uploaded to GPU memory. */
- char dirty;
-
- /** Array of attributes. */
- VertexAttribute *attributes[MAX_VERTEX_ATTRIBUTE];
-} VertexBuffer;
-
-/**
- * Creates an empty vertex buffer.
- *
- * @param format a string describing vertex format.
- * @return an empty vertex buffer.
- */
- VertexBuffer *
- vertex_buffer_new( const char *format );
-
-
-/**
- * Creates a vertex buffer from data.
- *
- * @param format a string describing vertex format.
- * @param vcount number of vertices
- * @param vertices raw vertices data
- * @param icount number of vertices
- * @param indices raw indices data
- * @return an empty vertex buffer.
- */
- VertexBuffer *
- vertex_buffer_new_from_data( char *format,
- size_t vcount,
- void * vertices,
- size_t icount,
- GLuint * indices );
-
-
-/**
- * Deletes vertex buffer and releases GPU memory.
- *
- * @param self a vertex buffer
- */
- void
- vertex_buffer_delete( VertexBuffer * self );
-
-
-
-/**
- * Print information about a vertex buffer
- *
- * @param self a vertex buffer
- */
- void
- vertex_buffer_print( VertexBuffer * self );
-
-
-/**
- * Immediate draw
- *
- * @param self a vertex buffer
- * @param mode render mode
- * @param what attributes to be rendered
- */
- void
- vertex_buffer_draw ( const char * format,
- const GLenum mode,
- const void * vertices,
- const size_t count );
-
-
-/**
- * Immediate draw with indexed vertices
- *
- * @param self a vertex buffer
- * @param mode render mode
- * @param what attributes to be rendered
- */
- void
- vertex_buffer_draw_indexed ( const char * format,
- const GLenum mode,
- const void * vertices,
- const size_t vcount,
- const GLuint * indices,
- const size_t icount );
-
-
-/**
- * Render vertex buffer.
- *
- * @param self a vertex buffer
- * @param mode render mode
- * @param what attributes to be rendered
- */
- void
- vertex_buffer_render ( VertexBuffer *self,
- GLenum mode,
- const char *what );
-
-
-/**
- * Upload buffer to GPU memory.
- *
- * @param self a vertex buffer
- */
- void
- vertex_buffer_upload( VertexBuffer *self );
-
-
-/**
- * Clear all vertices and indices
- *
- * @param self a vertex buffer
- */
- void
- vertex_buffer_clear( VertexBuffer *self );
-
-
-/**
- * Appends a single index at the end of the buffer.
- *
- * @param self a vertex buffer
- * @param index index to be appended
- */
- void
- vertex_buffer_push_back_index ( VertexBuffer *self,
- GLuint index );
-
-
-/**
- * Appends a single vertex at the end of the buffer.
- *
- * @param self a vertex buffer
- * @param vertex vertex to be appended
- */
- void
- vertex_buffer_push_back_vertex ( VertexBuffer *self,
- void *vertex );
-
-
-/**
- * Appends indices at the end of the buffer.
- *
- * @param self a vertex buffer
- * @param indices indices to be appended
- * @param count number of indices to be appended
- */
- void
- vertex_buffer_push_back_indices ( VertexBuffer *self,
- GLuint *indices,
- size_t count );
-
-
-/**
- * Appends vertices at the end of the buffer.
- *
- * @param self a vertex buffer
- * @param vertices vertices to be appended
- * @param count number of vertices to be appended
- */
- void
- vertex_buffer_push_back_vertices ( VertexBuffer *self,
- void *vertices,
- size_t count );
-
-
-/**
- * Appends indices at the end of the buffer.
- *
- * @param self a vertex buffer
- * @param index location before which to insert indices
- * @param indices indices to be appended
- * @param count number of indices to be appended
- */
- void
- vertex_buffer_insert_indices ( VertexBuffer *self,
- size_t index,
- GLuint *indices,
- size_t count );
-
-
-/**
- * Appends indices at the end of the buffer.
- *
- * @param self a vertex buffer
- * @param index location before which to insert vertices
- * @param vertices vertices to be appended
- * @param count number of vertices to be appended
- *
- * @note
- * Indices after index will be increased by count.
- */
- void
- vertex_buffer_add_vertices ( VertexBuffer *self,
- size_t index,
- void *vertices,
- size_t count );
-
-
-/**
- * Create an attribute from the given parameters.
- *
- * @param target client-side capability
- * @param index index of the generic vertex attribute to be modified.
- * @param size number of component
- * @param type data type
- * @param normalized Whether fixed-point data values should be normalized
- (GL_TRUE) or converted directly as fixed-point values
- (GL_FALSE) when they are accessed.
- * @param stride byte offset between consecutive attributes.
- * @param pointer pointer to the first component of the first attribute
- * element in the array.
- * @return a new initialized vertex attribute.
- */
-VertexAttribute *
-vertex_attribute_new( GLenum target,
- GLuint index,
- GLint size,
- GLenum type,
- GLboolean normalized,
- GLsizei stride,
- GLvoid *pointer );
-
-
-/**
- * Create an attribute from the given description.
- *
- * @param format Format string specifies the format of a vertex attribute.
- * @return an initialized vertex attribute
- *
- */
- VertexAttribute *
- vertex_attribute_parse( char *format );
-
-
-/**
- * Enable the position vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_position_enable( VertexAttribute *attr );
-
-
-/**
- * Enable the normal vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_normal_enable( VertexAttribute *attr );
-
-
-/**
- * Enable the color vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_color_enable( VertexAttribute *attr );
-
-
-/**
- * Enable the texture vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_tex_coord_enable( VertexAttribute *attr );
-
-
-/**
- * Enable the fog vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_fog_coord_enable( VertexAttribute *attr );
-
-
-/**
- * Enable the edge flag vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_edge_flag_enable( VertexAttribute *attr );
-
-
-/**
- * Enable the secondary color vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_secondary_color_enable( VertexAttribute *attr );
-
-/**
- * Enable a generic vertex attribute.
- *
- * @param attr a vertex attribute
- */
- void
- vertex_attribute_generic_attribute_enable( VertexAttribute *attr );
-
-
-/**
- * Returns the GL enum type correspond to given character.
- *
- * @param ctype character type
- * @return GL enum type
- */
- GLenum
- GL_TYPE( char ctype );
-
-
-/**
- * Get the GL name of the given target.
- *
- * @param ctarget a char describing target ( one of v,c,e,f,n,s,t)
- * @return the associated GL target
- */
- GLenum
- GL_VERTEX_ATTRIBUTE_TARGET( char ctarget );
-
-
-/**
- * Returns the size of a given GL enum type.
- *
- * @param gtype a GL enum type
- * @return the size of the given type
- */
- GLuint
- GL_TYPE_SIZE( GLenum gtype );
-
-
-/**
- * Returns the literal string of given GL enum type.
- *
- * @param gtype a GL enum type
- * @return the literal string describing the type
- */
- char *
- GL_TYPE_STRING( GLenum gtype );
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __VERTEX_BUFFER_H__ */
-
-#endif
diff --git a/source/shared_lib/include/graphics/gl/font_text_freetypegl.h b/source/shared_lib/include/graphics/gl/font_text_freetypegl.h
deleted file mode 100644
index 09d397e9..00000000
--- a/source/shared_lib/include/graphics/gl/font_text_freetypegl.h
+++ /dev/null
@@ -1,281 +0,0 @@
-// ==============================================================
-// This file is part of the MegaGlest Shared Library (www.megaglest.org)
-//
-// Copyright (C) 2011 Mark Vejvoda and others
-//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
-
-#ifndef TextFreetypeGL_h
-#define TextFreetypeGL_h
-
-#ifdef USE_FREETYPEGL
-
-//#include
-#include
-
-//#include "vector.h"
-#include "texture-font.h"
-#include "texture-atlas.h"
-#include "vertex-buffer.h"
-#include "font-manager.h"
-
-#include "font_text.h"
-#include "vec.h"
-
-namespace Shared { namespace Graphics { namespace Gl {
-
-/**
- * Use Freetype-GL for rendering text in OpenGL
- */
-//====================================================================
-class TextFreetypeGL : public Text
-{
-public:
-
- static string langHeightText;
- static int faceResolution;
-
- TextFreetypeGL(FontTextHandlerType type);
- virtual ~TextFreetypeGL();
- virtual void init(string fontName, string fontFamilyName, int fontSize);
-
- virtual void SetFaceSize(int);
- virtual int GetFaceSize();
-
- virtual void Render(const char*, const int = -1);
- virtual float Advance(const char*, const int = -1);
- virtual float LineHeight(const char*, const int = -1);
-
- virtual void Render(const wchar_t*, const int = -1);
- virtual float Advance(const wchar_t*, const int = -1);
- virtual float LineHeight(const wchar_t* = L" ", const int = -1);
-
-private:
-
- string lastTextRendered;
- Vec4f lastTextColorRendered;
-
- VertexBuffer *buffer;
- TextureAtlas *atlas;
- TextureFont *font;
- FontManager *manager;
- int fontFaceSize;
-
- string fontName;
- string fontFamilyName;
- const char* fontFile;
-
- void cleanupFont();
-};
-
-}}}//end namespace
-
-/**
- * Provides a way to easily walk multibyte unicode strings in the various
- * Unicode encodings (UTF-8, UTF-16, UTF-32, UCS-2, and UCS-4). Encodings
- * with elements larger than one byte must already be in the correct endian
- * order for the current architecture.
- */
-template
-class FreetypeGLUnicodeStringItr
-{
-public:
- /**
- * Constructor. Also reads the first character and stores it.
- *
- * @param string The buffer to iterate. No copy is made.
- */
- FreetypeGLUnicodeStringItr(const T* string) : curPos(string), nextPos(string)
- {
- (*this)++;
- };
-
- /**
- * Pre-increment operator. Reads the next unicode character and sets
- * the state appropriately.
- * Note - not protected against overruns.
- */
- FreetypeGLUnicodeStringItr& operator++()
- {
- curPos = nextPos;
- // unicode handling
- switch (sizeof(T))
- {
- case 1: // UTF-8
- // get this character
- readUTF8(); break;
- case 2: // UTF-16
- readUTF16(); break;
- case 4: // UTF-32
- // fall through
- default: // error condition really, but give it a shot anyway
- curChar = *nextPos++;
- }
- return *this;
- }
-
- /**
- * Post-increment operator. Reads the next character and sets
- * the state appropriately.
- * Note - not protected against overruns.
- */
- FreetypeGLUnicodeStringItr operator++(int)
- {
- FreetypeGLUnicodeStringItr temp = *this;
- ++*this;
- return temp;
- }
-
- /**
- * Equality operator. Two FreetypeGLUnicodeStringItrs are considered equal
- * if they have the same current buffer and buffer position.
- */
- bool operator==(const FreetypeGLUnicodeStringItr& right) const
- {
- if (curPos == right.getBufferFromHere())
- return true;
- return false;
- }
-
- /**
- * Dereference operator.
- *
- * @return The unicode codepoint of the character currently pointed
- * to by the FreetypeGLUnicodeStringItr.
- */
- unsigned int operator*() const
- {
- return curChar;
- }
-
- /**
- * Buffer-fetching getter. You can use this to retreive the buffer
- * starting at the currently-iterated character for functions which
- * require a Unicode string as input.
- */
- const T* getBufferFromHere() const { return curPos; }
-
-private:
- /**
- * Helper function for reading a single UTF8 character from the string.
- * Updates internal state appropriately.
- */
- void readUTF8();
-
- /**
- * Helper function for reading a single UTF16 character from the string.
- * Updates internal state appropriately.
- */
- void readUTF16();
-
- /**
- * The buffer position of the first element in the current character.
- */
- const T* curPos;
-
- /**
- * The character stored at the current buffer position (prefetched on
- * increment, so there's no penalty for dereferencing more than once).
- */
- unsigned int curChar;
-
- /**
- * The buffer position of the first element in the next character.
- */
- const T* nextPos;
-
- // unicode magic numbers
- static const unsigned char utf8bytes[256];
- static const unsigned long offsetsFromUTF8[6];
- static const unsigned long highSurrogateStart;
- static const unsigned long highSurrogateEnd;
- static const unsigned long lowSurrogateStart;
- static const unsigned long lowSurrogateEnd;
- static const unsigned long highSurrogateShift;
- static const unsigned long lowSurrogateBase;
-};
-
-/* The first character in a UTF8 sequence indicates how many bytes
- * to read (among other things) */
-template
-const unsigned char FreetypeGLUnicodeStringItr::utf8bytes[256] = {
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4,5,5,5,5,6,6,6,6
-};
-
-/* Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence. */
-template
-const unsigned long FreetypeGLUnicodeStringItr::offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
- 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-// get a UTF8 character; leave the tracking pointer at the start of the
-// next character
-// not protected against invalid UTF8
-template
-inline void FreetypeGLUnicodeStringItr::readUTF8()
-{
- unsigned int ch = 0;
- unsigned int extraBytesToRead = utf8bytes[(unsigned char)(*nextPos)];
- // falls through
- switch (extraBytesToRead)
- {
- case 6: ch += *nextPos++; ch <<= 6; /* remember, illegal UTF-8 */
- case 5: ch += *nextPos++; ch <<= 6; /* remember, illegal UTF-8 */
- case 4: ch += *nextPos++; ch <<= 6;
- case 3: ch += *nextPos++; ch <<= 6;
- case 2: ch += *nextPos++; ch <<= 6;
- case 1: ch += *nextPos++;
- }
- ch -= offsetsFromUTF8[extraBytesToRead-1];
- curChar = ch;
-}
-
-// Magic numbers for UTF-16 conversions
-template
-const unsigned long FreetypeGLUnicodeStringItr::highSurrogateStart = 0xD800;
-template
-const unsigned long FreetypeGLUnicodeStringItr::highSurrogateEnd = 0xDBFF;
-template
-const unsigned long FreetypeGLUnicodeStringItr::lowSurrogateStart = 0xDC00;
-template
-const unsigned long FreetypeGLUnicodeStringItr::lowSurrogateEnd = 0xDFFF;
-template
-const unsigned long FreetypeGLUnicodeStringItr::highSurrogateShift = 10;
-template
-const unsigned long FreetypeGLUnicodeStringItr::lowSurrogateBase = 0x0010000UL;
-
-template
-inline void FreetypeGLUnicodeStringItr::readUTF16()
-{
- unsigned int ch = *nextPos++;
- // if we have the first half of the surrogate pair
- if (ch >= highSurrogateStart && ch <= highSurrogateEnd)
- {
- unsigned int ch2 = *curPos;
- // complete the surrogate pair
- if (ch2 >= lowSurrogateStart && ch2 <= lowSurrogateEnd)
- {
- ch = ((ch - highSurrogateStart) << highSurrogateShift)
- + (ch2 - lowSurrogateStart) + lowSurrogateBase;
- ++nextPos;
- }
- }
- curChar = ch;
-}
-
-
-#endif // USE_FREETYPEGL
-
-#endif // TextFreetypeGL_h
diff --git a/source/shared_lib/include/platform/sdl/platform_main.h b/source/shared_lib/include/platform/sdl/platform_main.h
index bd5b34f2..70a3eda0 100644
--- a/source/shared_lib/include/platform/sdl/platform_main.h
+++ b/source/shared_lib/include/platform/sdl/platform_main.h
@@ -77,7 +77,6 @@ const char *GAME_ARGS[] = {
"--disable-vertex-interpolation",
"--disable-sound",
"--enable-legacyfonts",
- "--force-ftglfonts",
"--resolution",
"--colorbits",
@@ -160,7 +159,6 @@ enum GAME_ARG_TYPE {
GAME_ARG_DISABLE_VERTEX_INTERPOLATION,
GAME_ARG_DISABLE_SOUND,
GAME_ARG_ENABLE_LEGACYFONTS,
- GAME_ARG_FORCE_FTGLFONTS,
GAME_ARG_USE_RESOLUTION,
GAME_ARG_USE_COLORBITS,
@@ -440,18 +438,6 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) {
printf("\n%s\t\tenables using the legacy font system.",GAME_ARGS[GAME_ARG_ENABLE_LEGACYFONTS]);
- printf("\n%s\t\tforces use of the FTGL font system.",GAME_ARGS[GAME_ARG_FORCE_FTGLFONTS]);
-
-// printf("\n%s=x\t\t\toverride video settings.",GAME_ARGS[GAME_ARG_USE_VIDEO_SETTINGS]);
-// printf("\n \t\tWhere x is a string with the following format:");
-// printf("\n \t\twidthxheightxcolorbitsxdepthbitsxfullscreen");
-// printf("\n \t\twhere * indicates not to replace the default value for the parameter");
-// printf("\n \t\tfullscreen has possible values of true, false, 1 or 0");
-// printf("\n \t\tand only the width and height parameters are required (the others are optional)");
-// printf("\n \t\texample: %s %s=1024x768x*x*",extractFileFromDirectoryPath(argv0).c_str(),GAME_ARGS[GAME_ARG_USE_VIDEO_SETTINGS]);
-// printf("\n \t\tsame result for: %s %s=1024x768",extractFileFromDirectoryPath(argv0).c_str(),GAME_ARGS[GAME_ARG_USE_VIDEO_SETTINGS]);
-
-
// "================================================================================"
printf("\n%s=x\t\t\toverride the video resolution.",GAME_ARGS[GAME_ARG_USE_RESOLUTION]);
printf("\n \t\tWhere x is a string with the following format:");
diff --git a/source/shared_lib/include/xml/xml_parser.h b/source/shared_lib/include/xml/xml_parser.h
index 7bba65c8..3057cb07 100644
--- a/source/shared_lib/include/xml/xml_parser.h
+++ b/source/shared_lib/include/xml/xml_parser.h
@@ -14,8 +14,14 @@
#include
#include
-#include
#include