Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge branch 'develop' of ssh://git.khaganat.net:3543/khaganat/mmorpg_khanat/khanat-opennel-code into develop

Browse source
This commit is contained in:
Sit Melai 2018-05-02 21:50:21 +02:00
commit 151c415696
486 changed files with 3636 additions and 2922 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
.gitlab-ci.yml
View file

@ -277,13 +277,13 @@ Linux client_static debian_amd64_strech build:
zlib1g-dev
- apt-get install -y liblua5.2-0 liblua5.2-dev
# Build Curl
- wget -q https://curl.haxx.se/download/curl-7.58.0.tar.gz -O curl.tar.gz
- wget -q https://curl.haxx.se/download/curl-7.58.0.tar.gz -O curl.tar.gz
- mkdir -p curl/build
- tar xvf curl.tar.gz -C curl --strip 1
- (cd curl/build; cmake -DCMAKE_BUILD_TYPE=Release -DCURL_ZLIB=ON -DBUILD_CURL_EXE=OFF -DCURL_STATICLIB=ON -DHTTP_ONLY=ON -DENABLE_IPV6=ON -DCMAKE_USE_OPENSSL=ON -DOPENSSL_SSL_LIBRARIES=/usr/lib/x86_64-linux-gnu/libssl.a -DOPENSSL_CRYPTO_LIBRARIES=/usr/lib/x86_64-linux-gnu/libcrypto.a -DCMAKE_USE_LIBSSH2=OFF -DZLIB_LIBRARY=/usr/lib/x86_64-linux-gnu/libz.a -DCMAKE_C_FLAGS='-fPIC' ..)
- (cd curl/build; make)
- (cd curl/build; make install)
# Build
# Build luabind
- mkdir -p luabind
- wget -q http://http.debian.net/debian/pool/main/l/luabind/luabind_0.9.1+dfsg.orig.tar.gz -O luabind.tar.gz
- wget -q http://http.debian.net/debian/pool/main/l/luabind/luabind_0.9.1+dfsg-11.debian.tar.xz -O luabind-debian.tar.xz
@ -291,8 +291,8 @@ Linux client_static debian_amd64_strech build:
- tar xvf luabind-debian.tar.xz -C luabind || exit 2
- cd luabind
- for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file; done
- export -p DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH); bjam -d2 release debug install cflags="-fPIC $(dpkg-buildflags --get CFLAGS)" cxxflags="-fPIC $(dpkg-buildflags --get CXXFLAGS)" linkflags=" $(dpkg-buildflags --get LDFLAGS)"
- export -p DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH); bjam -d2 release debug install link=static cflags="-fPIC $(dpkg-buildflags --get CFLAGS)" cxxflags="-fPIC $(dpkg-buildflags --get CXXFLAGS)" linkflags=" $(dpkg-buildflags --get LDFLAGS)"
- export -p DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH); bjam -d2 release debug install cflags="-fPIC $(dpkg-buildflags --get CFLAGS)" cxxflags="-fPIC $(dpkg-buildflags --get CXXFLAGS) -Wno-deprecated-declarations" linkflags=" $(dpkg-buildflags --get LDFLAGS)"
- export -p DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH); bjam -d2 release debug install link=static cflags="-fPIC $(dpkg-buildflags --get CFLAGS)" cxxflags="-fPIC $(dpkg-buildflags --get CXXFLAGS) -Wno-deprecated-declarations" linkflags=" $(dpkg-buildflags --get LDFLAGS)"
- cd ..
# Build libogg
- mkdir -p libogg/build
@ -334,7 +334,83 @@ Linux client_static debian_amd64_strech build:
- (cd code/build; make khanat_client)
- (cd code/build/bin; ls -lh)
artifacts:
name: "khanat-client_static-debian_strech-$CI_COMMIT_REF_NAME"
name: "khanat-client_static-debian_amd64_strech-$CI_COMMIT_REF_NAME"
paths:
- code/build/bin
expire_in: 2 week
Linux client_static debian_i386_strech build:
stage: build
except:
- mac-ci-build
tags:
- Docker
image: i386/debian:9
script:
# Prepare environment
- apt-get update
- apt-get dist-upgrade -y
- apt-get install -y autoconf autogen automake bison build-essential cmake cpputest fakeroot libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblzma-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial rrdtool unzip wget zlib1g-dev
- apt-get install -y liblua5.2-0 liblua5.2-dev
# Build Curl
- wget -q https://curl.haxx.se/download/curl-7.58.0.tar.gz -O curl.tar.gz
- mkdir -p curl/build
- tar xvf curl.tar.gz -C curl --strip 1
- (cd curl/build; cmake -DCMAKE_BUILD_TYPE=Release -DCURL_ZLIB=ON -DBUILD_CURL_EXE=OFF -DCURL_STATICLIB=ON -DHTTP_ONLY=ON -DENABLE_IPV6=ON -DCMAKE_USE_OPENSSL=ON -DOPENSSL_SSL_LIBRARIES=/usr/lib/i386-linux-gnu/libssl.a -DOPENSSL_CRYPTO_LIBRARIES=/usr/lib/i386-linux-gnu/libcrypto.a -DCMAKE_USE_LIBSSH2=OFF -DZLIB_LIBRARY=/usr/lib/i386-linux-gnu/libz.a -DCMAKE_C_FLAGS='-fPIC' ..)
- (cd curl/build; make)
- (cd curl/build; make install)
# Build luabind
- mkdir -p luabind
- wget -q http://http.debian.net/debian/pool/main/l/luabind/luabind_0.9.1+dfsg.orig.tar.gz -O luabind.tar.gz
- wget -q http://http.debian.net/debian/pool/main/l/luabind/luabind_0.9.1+dfsg-11.debian.tar.xz -O luabind-debian.tar.xz
- tar xvf luabind.tar.gz -C luabind --strip 1 || exit 2
- tar xvf luabind-debian.tar.xz -C luabind || exit 2
- cd luabind
- for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file; done
- export -p DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH); bjam -d2 release debug install cflags="-fPIC $(dpkg-buildflags --get CFLAGS)" cxxflags="-fPIC $(dpkg-buildflags --get CXXFLAGS) -Wno-deprecated-declarations" linkflags=" $(dpkg-buildflags --get LDFLAGS)"
- export -p DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH); bjam -d2 release debug install link=static cflags="-fPIC $(dpkg-buildflags --get CFLAGS)" cxxflags="-fPIC $(dpkg-buildflags --get CXXFLAGS) -Wno-deprecated-declarations" linkflags=" $(dpkg-buildflags --get LDFLAGS)"
- cd ..
# Build libogg
- mkdir -p libogg/build
- wget -q http://http.debian.net/debian/pool/main/libo/libogg/libogg_1.3.2.orig.tar.gz -O libogg.tar.gz
- wget -q http://http.debian.net/debian/pool/main/libo/libogg/libogg_1.3.2-1.diff.gz -O libogg.diff.gz
- tar xvf libogg.tar.gz -C libogg --strip 1 || exit 2
- gunzip libogg.diff.gz
- cd libogg
- patch -p1 < ../libogg.diff
- cd build
- ../configure --disable-maintainer-mode --host=$(dpkg-architecture -qDEB_HOST_GNU_TYPE) --build=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) --enable-static --prefix=/usr CPPFLAGS="-D_FORTIFY_SOURCE=2" CFLAGS="-Wformat=2 -g -fPIC" CXXFLAGS="-Wformat=2 -g -fPIC" LDFLAGS="-Wl,-z,now"
- make
- make install
- cd ../..
# Build libvorbis
- mkdir -p libvorbis
- wget -q http://security.debian.org/debian-security/pool/updates/main/libv/libvorbis/libvorbis_1.3.5.orig.tar.gz -O libvorbis.tar.gz
- tar xvf libvorbis.tar.gz -C libvorbis --strip 1 || exit 2
# Get list package
- wget -q http://security.debian.org/debian-security/pool/updates/main/libv/libvorbis -O list_libvorbis
# get last patch for our release
- line=$(egrep '(libvorbis_1.3.5)(.*)(tar[.]xz)' list_libvorbis | tail -n 1)
# get only name of the patch
- tmp=${line#*href} ; tmp2=${tmp%%>*} ; tmp3=${tmp2#*\"} ; namepatch=${tmp3%\"*}
# download this patch
- wget -q http://security.debian.org/debian-security/pool/updates/main/libv/libvorbis/$namepatch -O libvorbis.debian.tar.xz
- tar xvf libvorbis.debian.tar.xz -C libvorbis || exit 2
- cd libvorbis
- for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file; done
- ./configure --enable-static --with-pic
- make
- make install
- cd ..
# Action
- mkdir -p code/build
- (cd code; patch -i ../patch/libcrypto.patch)
- (cd code; patch -i ../patch/libicuuc.patch)
- (cd code/build ; cmake -DWITH_NEL=ON -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=OFF -DWITH_RYZOM_CUSTOM_PATCH_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..)
- (cd code/build; make khanat_client)
- (cd code/build/bin; ls -lh)
artifacts:
name: "khanat-client_static-debian_i386_strech-$CI_COMMIT_REF_NAME"
paths:
- code/build/bin
expire_in: 2 week
@ -588,12 +664,12 @@ Windows client build:
- mkdir -p build
- cd build
- wine cmake.exe -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_PATCH=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_LUA53=ON -DWITH_LUA51=OFF -DWITH_STLPORT=OFF -DWITH_DRIVER_DSOUND=ON -G "NMake Makefiles JOM" -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_DRIVER_OPENAL=OFF -DWITH_DRIVER_DSOUND=ON -DWITH_DRIVER_XAUDIO2=ON -DWITH_DRIVER_FMOD=ON -DWITH_DRIVER_DIRECT3D=ON ../codebis
#- wine jom.exe
# artifacts:
# name: "khanat-client-windows-$CI_COMMIT_REF_NAME"
# paths:
# - build/bin
# expire_in: 2 week
- wine jom.exe
artifacts:
name: "khanat-client-windows-$CI_COMMIT_REF_NAME"
paths:
- build/bin
expire_in: 2 week
# Job de compilation pour OSX
OSX client build:

7
code/CMakeLists.txt
View file

@ -62,6 +62,7 @@ SET(AUTHOR "Winch Gate and The Ryzom Core Community")
SET(RYZOM_VERSION_MAJOR 3)
SET(RYZOM_VERSION_MINOR 2)
SET(RYZOM_VERSION_PATCH 1)
SET(REVISION 0)
#-----------------------------------------------------------------------------
# Redirect output files
@ -116,6 +117,10 @@ FIND_PACKAGE(OpenSSL REQUIRED)
FIND_PACKAGE(GIF)
FIND_PACKAGE(Jpeg)
IF(WIN32)
SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
ENDIF()
IF(WITH_LIBOVR)
FIND_PACKAGE(LibOVR)
ENDIF()
@ -447,8 +452,6 @@ IF(WITH_NEL)
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${INTL_LIBRARY})
ENDIF()
ENDIF()
ELSEIF(WIN32)
SET(CURL_LIBRARIES ${CURL_LIBRARIES} Crypt32.lib)
ENDIF()
ENDIF()
ENDIF()

86
code/CMakeModules/FindMSVC.cmake
View file

@ -56,16 +56,18 @@ MACRO(DETECT_VC_VERSION_HELPER _ROOT _VERSION)
ENDMACRO()
MACRO(DETECT_VC_VERSION _VERSION)
SET(VC${_VERSION}_FOUND OFF)
DETECT_VC_VERSION_HELPER("HKEY_CURRENT_USER" ${_VERSION})
IF(NOT VC_FOUND)
SET(VC${_VERSION}_FOUND OFF)
DETECT_VC_VERSION_HELPER("HKEY_CURRENT_USER" ${_VERSION})
IF(NOT VC${_VERSION}_FOUND)
DETECT_VC_VERSION_HELPER("HKEY_LOCAL_MACHINE" ${_VERSION})
ENDIF()
IF(NOT VC${_VERSION}_FOUND)
DETECT_VC_VERSION_HELPER("HKEY_LOCAL_MACHINE" ${_VERSION})
ENDIF()
IF(VC${_VERSION}_FOUND)
SET(VC_FOUND ON)
SET(VC_DIR "${VC${_VERSION}_DIR}")
IF(VC${_VERSION}_FOUND)
SET(VC_FOUND ON)
SET(VC_DIR "${VC${_VERSION}_DIR}")
ENDIF()
ENDIF()
ENDMACRO()
@ -77,7 +79,7 @@ MACRO(DETECT_EXPRESS_VERSION _VERSION)
ENDIF()
ENDMACRO()
IF(MSVC1411 OR MSVC1410)
IF(MSVC_VERSION GREATER 1909)
DETECT_VC_VERSION("15.0")
SET(MSVC_TOOLSET "140")
@ -98,44 +100,18 @@ IF(MSVC1411 OR MSVC1410)
SET(VC_DIR "${VC_DIR}/${MSVC_TOOLCHAIN_VERSION}")
SET(VC_INCLUDE_DIR "${VC_DIR}/include")
IF(NOT MSVC14_REDIST_DIR)
# If you have VC++ 2017 Express, put x64/Microsoft.VC141.CRT/*.dll in ${EXTERNAL_PATH}/redist
# original files whould be in ${VC_DIR}/Redist/MSVC/14.11.25325/x64/Microsoft.VC141.CRT
SET(MSVC14_REDIST_DIR "${EXTERNAL_PATH}/redist")
ENDIF()
ELSEIF(MSVC14)
DETECT_VC_VERSION("14.0")
SET(MSVC_TOOLSET "140")
IF(NOT MSVC14_REDIST_DIR)
# If you have VC++ 2015 Express, put x64/Microsoft.VC140.CRT/*.dll in ${EXTERNAL_PATH}/redist
SET(MSVC14_REDIST_DIR "${EXTERNAL_PATH}/redist")
ENDIF()
ELSEIF(MSVC12)
DETECT_VC_VERSION("12.0")
SET(MSVC_TOOLSET "120")
IF(NOT MSVC12_REDIST_DIR)
# If you have VC++ 2013 Express, put x64/Microsoft.VC120.CRT/*.dll in ${EXTERNAL_PATH}/redist
SET(MSVC12_REDIST_DIR "${EXTERNAL_PATH}/redist")
ENDIF()
ELSEIF(MSVC11)
DETECT_VC_VERSION("11.0")
SET(MSVC_TOOLSET "110")
IF(NOT MSVC11_REDIST_DIR)
# If you have VC++ 2012 Express, put x64/Microsoft.VC110.CRT/*.dll in ${EXTERNAL_PATH}/redist
SET(MSVC11_REDIST_DIR "${EXTERNAL_PATH}/redist")
ENDIF()
ELSEIF(MSVC10)
DETECT_VC_VERSION("10.0")
SET(MSVC_TOOLSET "100")
IF(NOT MSVC10_REDIST_DIR)
# If you have VC++ 2010 Express, put x64/Microsoft.VC100.CRT/*.dll in ${EXTERNAL_PATH}/redist
SET(MSVC10_REDIST_DIR "${EXTERNAL_PATH}/redist")
ENDIF()
ELSEIF(MSVC90)
DETECT_VC_VERSION("9.0")
SET(MSVC_TOOLSET "90")
@ -147,6 +123,8 @@ ENDIF()
# If you plan to use VC++ compilers with WINE, set VC_DIR environment variable
IF(NOT VC_DIR)
SET(VC_DIR $ENV{VC_DIR})
# Fix path
FILE(TO_CMAKE_PATH ${VC_DIR} VC_DIR)
ENDIF()
IF(NOT VC_DIR)
@ -158,8 +136,44 @@ IF(NOT VC_DIR)
STRING(REGEX REPLACE "/(bin|BIN|Bin)/.+" "" VC_DIR ${_COMPILER})
ENDIF()
IF(NOT VC_INCLUDE_DIR)
IF(NOT VC_INCLUDE_DIR AND VC_DIR AND EXISTS "${VC_DIR}")
SET(VC_INCLUDE_DIR "${VC_DIR}/include")
IF(EXISTS "${VC_INCLUDE_DIR}")
SET(VC_FOUND ON)
ENDIF()
ENDIF()
SET(MSVC_REDIST_DIR "${EXTERNAL_PATH}/redist")
IF(NOT EXISTS "${MSVC_REDIST_DIR}")
SET(MSVC_REDIST_DIR "${VC_DIR}/redist")
IF(NOT EXISTS "${MSVC_REDIST_DIR}")
SET(MSVC_REDIST_DIR)
ENDIF()
ENDIF()
IF(MSVC_REDIST_DIR)
IF(MSVC1411 OR MSVC1410)
# If you have VC++ 2017 Express, put x64/Microsoft.VC141.CRT/*.dll in ${EXTERNAL_PATH}/redist
# original files whould be in ${VC_DIR}/Redist/MSVC/14.11.25325/x64/Microsoft.VC141.CRT
SET(MSVC14_REDIST_DIR "${MSVC_REDIST_DIR}")
ELSEIF(MSVC14)
SET(MSVC14_REDIST_DIR "${MSVC_REDIST_DIR}")
ELSEIF(MSVC12)
# If you have VC++ 2013 Express, put x64/Microsoft.VC120.CRT/*.dll in ${EXTERNAL_PATH}/redist
SET(MSVC12_REDIST_DIR "${MSVC_REDIST_DIR}")
ELSEIF(MSVC11)
# If you have VC++ 2012 Express, put x64/Microsoft.VC110.CRT/*.dll in ${EXTERNAL_PATH}/redist
SET(MSVC11_REDIST_DIR "${MSVC_REDIST_DIR}")
ELSEIF(MSVC10)
# If you have VC++ 2010 Express, put x64/Microsoft.VC100.CRT/*.dll in ${EXTERNAL_PATH}/redist
SET(MSVC10_REDIST_DIR "${MSVC_REDIST_DIR}")
ELSEIF(MSVC90)
SET(MSVC90_REDIST_DIR "${MSVC_REDIST_DIR}")
ELSEIF(MSVC80)
SET(MSVC80_REDIST_DIR "${MSVC_REDIST_DIR}")
ENDIF()
ENDIF()
MESSAGE(STATUS "Using headers from ${VC_INCLUDE_DIR}")

3
code/CMakeModules/FindMySQL.cmake
View file

@ -69,6 +69,9 @@ ELSE()
ENDIF()
FIND_PACKAGE(OpenSSL)
IF(OPENSSL_FOUND)
IF(WIN32)
SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
ENDIF()
SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} ${OPENSSL_LIBRARIES})
ENDIF()
ENDIF()

4
code/CMakeModules/FindWindowsSDK.cmake
View file

@ -240,7 +240,7 @@ MACRO(USE_CURRENT_WINSDK)
IF(NOT WINSDK_DIR)
# Use Windows SDK versions installed with VC++ when possible
IF(MSVC1411 OR MSVC1410)
IF(MSVC_VERSION GREATER 1909)
# Special case, use Kits for SDK
SET(WINSDK_VERSION "10.0")
SET(WINSDK_DIR ${WINSDK_UCRT_DIR})
@ -484,7 +484,7 @@ IF(WINSDK_INCLUDE_DIR)
SET(CMAKE_LIBRARY_PATH ${WINSDK_LIBRARY_DIR} ${CMAKE_LIBRARY_PATH})
# Fix for using Windows SDK 7.1 with Visual C++ 2012, 2013 and 2015
# Fix for using Windows SDK 7.1 with Visual C++ 2012, 2013, 2015 and 2017
IF(WINSDK_VERSION STREQUAL "7.1" AND (MSVC11 OR MSVC12 OR MSVC14))
ADD_DEFINITIONS(-D_USING_V110_SDK71_)
ENDIF()

62
code/CMakeModules/Findassimp.cmake
View file

@ -1,29 +1,63 @@
IF(assimp_FIND_REQUIRED)
SET(ASSIMP_FIND_REQUIRED ON)
ENDIF()
FIND_PATH(
assimp_INCLUDE_DIRS
ASSIMP_INCLUDE_DIRS
NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
PATHS /usr/local/include/
)
FIND_LIBRARY(
assimp_LIBRARIES
ASSIMP_LIBRARY_RELEASE
NAMES assimp
PATHS /usr/local/lib/
)
IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
SET(assimp_FOUND TRUE)
FIND_LIBRARY(
IRRXML_LIBRARY_RELEASE
NAMES IrrXML
PATHS /usr/local/lib/
)
FIND_LIBRARY(
ASSIMP_LIBRARY_DEBUG
NAMES assimpd
PATHS /usr/local/lib/
)
FIND_LIBRARY(
IRRXML_LIBRARY_DEBUG
NAMES IrrXMLd
PATHS /usr/local/lib/
)
IF (ASSIMP_INCLUDE_DIRS)
SET(ASSIMP_FOUND TRUE)
IF(ASSIMP_LIBRARY_RELEASE)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${ASSIMP_LIBRARY_RELEASE})
ENDIF()
IF(ASSIMP_LIBRARY_DEBUG)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${ASSIMP_LIBRARY_DEBUG})
ENDIF()
FIND_PACKAGE(ZLIB)
IF(ZLIB_FOUND)
SET(assimp_LIBRARIES ${assimp_LIBRARIES} ${ZLIB_LIBRARIES})
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} ${ZLIB_LIBRARIES})
ENDIF()
ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
IF(IRRXML_LIBRARY_RELEASE)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${IRRXML_LIBRARY_RELEASE})
ENDIF()
IF(IRRXML_LIBRARY_DEBUG)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${IRRXML_LIBRARY_DEBUG})
ENDIF()
ENDIF()
IF (assimp_FOUND)
IF (NOT assimp_FIND_QUIETLY)
MESSAGE(STATUS "Found asset importer library: ${assimp_LIBRARIES}")
ENDIF (NOT assimp_FIND_QUIETLY)
ELSE (assimp_FOUND)
IF (assimp_FIND_REQUIRED)
IF (ASSIMP_FOUND)
IF (NOT ASSIMP_FIND_QUIETLY)
MESSAGE(STATUS "Found asset importer library: ${ASSIMP_LIBRARIES}")
ENDIF ()
ELSE (ASSIMP_FOUND)
IF (ASSIMP_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find asset importer library")
ENDIF (assimp_FIND_REQUIRED)
ENDIF (assimp_FOUND)
ENDIF ()
ENDIF ()

26
code/CMakeModules/OSXToolChain.cmake
View file

@ -24,9 +24,25 @@ IF(DEFINED CMAKE_CROSSCOMPILING)
ENDIF()
# Force the compilers to Clang for OS X
# C
SET(CMAKE_C_COMPILER x86_64-apple-darwin15-clang)
SET(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11")
SET(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert")
SET(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes")
SET(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros")
SET(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert")
# C++
SET(CMAKE_CXX_COMPILER x86_64-apple-darwin15-clang++)
set(CMAKE_CXX_COMPILER_ID "AppleClang")
SET(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17")
SET(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters")
SET(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
SET(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
SET(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17")
# make
SET(CMAKE_MAKE_PROGRAM make)
# Skip the platform compiler checks for cross compiling.
SET(CMAKE_CXX_COMPILER_FORCED TRUE)
@ -86,9 +102,10 @@ SET(CMAKE_OSX_SYSROOT ${CMAKE_OSX_SYSROOT}/MacOSX${OSX_SDK}.sdk)
# Standard settings
SET(CMAKE_SYSTEM_NAME Darwin)
set(CMAKE_SYSTEM "Darwin-15.0.0")
set(CMAKE_SYSTEM_VERSION "15.0.0")
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
SET(CMAKE_SYSTEM "Darwin-15.0.0")
SET(CMAKE_SYSTEM_VERSION "15.0.0")
SET(CMAKE_SYSTEM_PROCESSOR "x86_64")
SET(UNIX ON)
SET(APPLE ON)
@ -112,4 +129,3 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# determinate location for bin utils based on CMAKE_FIND_ROOT_PATH
INCLUDE(CMakeFindBinUtils)

2
code/nel/include/nel/3d/flare_shape.h
View file

@ -55,7 +55,7 @@ public:
CFlareShape();
/// serial this shape
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
//@}

10
code/nel/include/nel/3d/key.h
View file

@ -47,7 +47,7 @@ public:
public:
/// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
void serial (NLMISC::IStream& f)
{
// Version number
(void)f.serialVersion (0);
@ -83,7 +83,7 @@ class CKeyTCB : public CKey<T>
public:
/// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
void serial (NLMISC::IStream& f)
{
// Version number
(void)f.serialVersion (0);
@ -130,7 +130,7 @@ class CKeyBezier : public CKey<T>
public:
/// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
void serial (NLMISC::IStream& f)
{
// Version number
(void)f.serialVersion (0);
@ -180,7 +180,7 @@ template<> class CKeyTCB<NLMISC::CAngleAxis> : public CKey<NLMISC::CAngleAxis>
public:
/// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
void serial (NLMISC::IStream& f)
{
// Version number
(void)f.serialVersion (0);
@ -228,7 +228,7 @@ template<> class CKeyBezier<NLMISC::CQuat> : public CKey<NLMISC::CQuat>
public:
/// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
void serial (NLMISC::IStream& f)
{
// Version number
(void)f.serialVersion (0);

12
code/nel/include/nel/3d/mesh.h
View file

@ -85,7 +85,7 @@ public:
// This is slow but doesn't matter since used at mesh building....
CCorner();
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
};
/// A Triangle face.
@ -94,7 +94,7 @@ public:
CCorner Corner[3];
sint32 MaterialId;
sint32 SmoothGroup;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
};
@ -118,7 +118,7 @@ public:
}
}
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
};
struct CVertLink
@ -203,7 +203,7 @@ public:
CMeshBuild();
// Serialization
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
};
//@}
@ -257,7 +257,7 @@ public:
virtual void render(IDriver *drv, CTransformShape *trans, bool opaquePass);
/// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMesh);
/// get trinagle count.
@ -370,7 +370,7 @@ public:
virtual float getNumTriangles (float distance);
/// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshGeom);
// profile

4
code/nel/include/nel/3d/mesh_base.h
View file

@ -146,7 +146,7 @@ public:
CMeshBaseBuild();
// Serialization is not used
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
};
//@}
@ -201,7 +201,7 @@ public:
// @}
/// serial the base Part of this mesh.
void serialMeshBase(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialMeshBase(NLMISC::IStream &f);
/// Flush textures
void flushTextures (IDriver &driver, uint selectedTexture);

4
code/nel/include/nel/3d/mesh_morpher.h
View file

@ -43,7 +43,7 @@ public:
std::vector<uint32> VertRefs; // Array of vertices reference
void serial (NLMISC::IStream &f) throw(NLMISC::EStream);
void serial (NLMISC::IStream &f);
};
// ***************************************************************************
@ -90,7 +90,7 @@ public:
NLMISC::CObjectVector<CRawSkinVertex*, false> &vertexRemap,
std::vector<CAnimatedMorph> *pBSFactor);
void serial (NLMISC::IStream &f) throw(NLMISC::EStream);
void serial (NLMISC::IStream &f);
private:

10
code/nel/include/nel/3d/mesh_mrm.h
View file

@ -115,7 +115,7 @@ public:
virtual float getNumTriangles (float distance);
/// serial this meshGeom.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshMRMGeom);
/// Scene profile
@ -579,11 +579,11 @@ private:
/// load the header of this mesh. return the version of the header.
sint loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream);
sint loadHeader(NLMISC::IStream &f);
/// load this mesh.
void load(NLMISC::IStream &f) throw(NLMISC::EStream);
void load(NLMISC::IStream &f);
/// save the entire mesh.
void save(NLMISC::IStream &f) throw(NLMISC::EStream);
void save(NLMISC::IStream &f);
// Build bone Usage information for serialized mesh <= version 2.
void buildBoneUsageVer2 ();
@ -702,7 +702,7 @@ public:
virtual float getNumTriangles (float distance);
/// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshMRM);
/// Get bbox.

4
code/nel/include/nel/3d/mesh_multi_lod.h
View file

@ -125,7 +125,7 @@ public:
virtual void getAABBox(NLMISC::CAABBox &bbox) const;
/// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/// Declare name of the shape
NLMISC_DECLARE_CLASS(CMeshMultiLod);
@ -238,7 +238,7 @@ private:
std::vector<TCoarseMeshIndexType> CoarseTriangles;
/// Serial
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/// Is Opaque ?
bool isOpaque() { return (Flags&IsOpaque)!=0; }

2
code/nel/include/nel/3d/meshvp_per_pixel_light.h
View file

@ -65,7 +65,7 @@ public:
const NLMISC::CMatrix &invertedModelMat,
const NLMISC::CVector &viewerPos);
virtual void end(IDriver *drv);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
virtual void setupForMaterial(const CMaterial &mat,
IDriver *drv,
CScene *scene,

2
code/nel/include/nel/3d/meshvp_wind_tree.h
View file

@ -90,7 +90,7 @@ public:
virtual float getMaxVertexMove();
// Serial.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshVPWindTree);
// @}

8
code/nel/include/nel/3d/packed_world.h
View file

@ -54,9 +54,9 @@ public:
void build(std::vector<TPackedZoneBaseSPtr> &packesZones);
bool raytrace(const NLMISC::CVector &start, const NLMISC::CVector &end, NLMISC::CVector &inter, std::vector<NLMISC::CTriangle> *testedTriangles = NULL, NLMISC::CVector *normal = NULL);
void getZones(std::vector<TPackedZoneBaseSPtr> &zones);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
// just serialize the header, containing name of the zones this CPackedWorld was built from
void serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialZoneNames(NLMISC::IStream &f);
/** Roughly select triangles that are within a convex 2D polygon (world coordinates)
* Selection is not exact, because limited to the resolution of the grid into which is packed each zone.
* Triangle that are within are guaranteed to be selected, however.
@ -68,7 +68,7 @@ private:
public:
TPackedZoneBaseSPtr Zone;
uint32 RaytraceCounter;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
CPackedZoneBase *pz = Zone;
@ -81,7 +81,7 @@ private:
{
public:
std::vector<uint32> IDs; // make a class from this vector just for serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serialCont(IDs);
}

12
code/nel/include/nel/3d/packed_zone.h
View file

@ -52,7 +52,7 @@ class CPackedVertex
public:
uint16 X, Y, Z;
public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serial(X, Y, Z);
}
@ -68,7 +68,7 @@ class CPackedTri
public:
uint32 V0, V1, V2;
public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serial(V0, V1, V2);
}
@ -79,7 +79,7 @@ class CPackedTri16
public:
uint16 V0, V1, V2;
public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serial(V0, V1, V2);
}
@ -101,7 +101,7 @@ public:
sint32 ZoneY;
public:
virtual ~CPackedZoneBase() {}
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) = 0;
virtual void serial(NLMISC::IStream &f) = 0;
// TMP For debug : render position covered by a frustum
virtual void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]) = 0;
// raytracing test
@ -138,7 +138,7 @@ public:
sint32 zoneX,
sint32 zoneY
);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
// TMP For debug : render porition covered by a frustum
void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]);
// try to build a 16 bit version of this packed zone to save some more place
@ -183,7 +183,7 @@ public:
NLMISC_DECLARE_CLASS(CPackedZone16)
CPackedZone16();
//
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
// TMP For debug : render position covered by a frustum
void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]);
// raytracing test

2
code/nel/include/nel/3d/particle_system.h
View file

@ -84,7 +84,7 @@ public:
/// dtor
virtual ~CParticleSystem();
/// serialize this particle system
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/** Merge this system with a system instanciated from the given shape
* NB : This is for edition purpose, this is slow
* \return true if the operation could be performed. It can fail when this cause the system the system to last forever,

2
code/nel/include/nel/3d/particle_system_process.h
View file

@ -102,7 +102,7 @@ class CParticleSystemProcess : public NLMISC::IStreamable
* Everything is saved, except for the fontManager and the fontGenerator.
* They must be set again if the PSToolRender pass is used.
*/
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) ;
virtual void serial(NLMISC::IStream &f);
/// @}

2
code/nel/include/nel/3d/particle_system_shape.h
View file

@ -90,7 +90,7 @@ public:
// @}
/// serial the shape
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CParticleSystemShape);

6
code/nel/include/nel/3d/ps_attrib.h
View file

@ -202,7 +202,7 @@ public:
uint size() const { return _Size; }
/// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
if (f.isReading())
{
@ -262,7 +262,7 @@ public:
CPSAttrib();
/// Serialization method
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
// swap with another vector
void swap(CPSAttrib<T> &other);
@ -429,7 +429,7 @@ void CPSAttrib<T>::remove(uint32 index)
}
template <typename T>
void CPSAttrib<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CPSAttrib<T>::serial(NLMISC::IStream &f)
{
// version 4 to 5 => bug with size being > capacity
sint ver = f.serialVersion(5);

4
code/nel/include/nel/3d/ps_attrib_maker.h
View file

@ -60,7 +60,7 @@ struct CPSInputType
uint32 UserParamNum;
};
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serialEnum(InputType);
switch(InputType)
@ -124,7 +124,7 @@ public:
}
/// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
f.serial(_NbCycles);

2
code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
View file

@ -103,7 +103,7 @@ public:
uint32 srcStep = (1 << 16)
) const;
virtual void serial (NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial (NLMISC::IStream &f);
virtual void deleteElement (uint32 index);
virtual void newElement (const CPSEmitterInfo &info);
virtual void resize (uint32 capacity, uint32 nbPresentElements);

2
code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
View file

@ -729,7 +729,7 @@ inline void CPSAttribMakerBinOp<T>::makeN(CPSLocated *loc,
//=================================================================================================================
template <class T>
inline void CPSAttribMakerBinOp<T>::serial (NLMISC::IStream &f) throw(NLMISC::EStream)
inline void CPSAttribMakerBinOp<T>::serial (NLMISC::IStream &f)
{
if (f.isReading())
{

10
code/nel/include/nel/3d/ps_attrib_maker_helper.h
View file

@ -96,7 +96,7 @@ template <typename T, class F> class CPSAttribMakerT : public CPSAttribMaker<T>
/// serialization of the object
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
sint ver = f.serialVersion(2);
CPSAttribMaker<T>::serial(f);
@ -1624,7 +1624,7 @@ public:
}
/// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
@ -1744,7 +1744,7 @@ public:
_MaxValue = other._MaxValue;
}
// serial. Should update min / max when reading
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
virtual uint32 getMinValue(void) const { return _MinValue; }
virtual uint32 getMaxValue(void) const { return _MaxValue; }
virtual void newElement(const CPSEmitterInfo &info);
@ -1767,7 +1767,7 @@ public:
_MaxValue = other._MaxValue;
}
// serial. Should update min / max when reading
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
virtual sint32 getMinValue(void) const { return _MinValue; }
virtual sint32 getMaxValue(void) const { return _MaxValue; }
virtual void newElement(const CPSEmitterInfo &info);
@ -1790,7 +1790,7 @@ public:
_MaxValue = other._MaxValue;
}
// serial. Should update min / max when reading
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
virtual float getMinValue(void) const { return _MinValue; }
virtual float getMaxValue(void) const { return _MaxValue; }
virtual void newElement(const CPSEmitterInfo &info);

8
code/nel/include/nel/3d/ps_attrib_maker_template.h
View file

@ -93,7 +93,7 @@ public:
CPSValueBlendFunc() {}
/// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
f.serial(_StartValue, _EndValue);
@ -228,7 +228,7 @@ public:
CPSValueBlendSampleFunc() {}
/// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
if (f.isReading())
@ -353,7 +353,7 @@ public:
}
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
T getMaxValue(void) const
@ -493,7 +493,7 @@ void CPSValueGradientFunc<T>::setValuesUnpacked(const T *valueTab, uint32 numVal
template <typename T>
void CPSValueGradientFunc<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CPSValueGradientFunc<T>::serial(NLMISC::IStream &f)
{
f.serialVersion(1);
f.serial(_NbStages);

12
code/nel/include/nel/3d/ps_color.h
View file

@ -66,7 +66,7 @@ public:
{
CPSValueBlendFunc<NLMISC::CRGBA>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType));
}
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
setColorType(CVertexBuffer::TRGBA);
CPSValueBlendFunc<NLMISC::CRGBA>::serial(f);
@ -100,7 +100,7 @@ public:
{
CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType));
}
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
setColorType(CVertexBuffer::TRGBA);
CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::serial(f);
@ -124,7 +124,7 @@ public:
NLMISC::CRGBA getValue(uint index) const;
void setValues(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages);
void setValuesUnpacked(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
setColorType(CVertexBuffer::TRGBA);
CPSValueGradientFunc<NLMISC::CRGBA>::serial(f);
@ -153,7 +153,7 @@ public:
this->_F.setColorType(colorType);
}
// serialisation should always be done in RGBA mode, so enforce that
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
setColorType(CVertexBuffer::TRGBA);
CPSAttribMakerT<NLMISC::CRGBA, F>::serial(f);
@ -229,7 +229,7 @@ public:
virtual void setColorType(CVertexBuffer::TVertexColorType colorType);
virtual void setDefaultValue(NLMISC::CRGBA defaultValue);
virtual NLMISC::CRGBA getDefaultValue(void) const;
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
protected:
CVertexBuffer::TVertexColorType _ColorType;
};
@ -244,7 +244,7 @@ public:
NLMISC_DECLARE_CLASS(CPSColorBinOp);
CPSAttribMakerBase *clone() const { return new CPSColorBinOp(*this); }
virtual void setColorType(CVertexBuffer::TVertexColorType colorType);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
};

2
code/nel/include/nel/3d/ps_dot.h
View file

@ -46,7 +46,7 @@ public:
NLMISC_DECLARE_CLASS(CPSDot);
///serialisation
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/// return true if there are transparent faces in the object
virtual bool hasTransparentFaces(void);

16
code/nel/include/nel/3d/ps_emitter.h
View file

@ -171,7 +171,7 @@ public:
const CPSAttribMaker<uint32> *getGenNbScheme(void) const { return _GenNbScheme; }
/// Serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
///\name Speed vector options
//@{
@ -424,7 +424,7 @@ class CPSModulatedEmitter
bool useEmitteeSpeedScheme(void) const { return _EmitteeSpeedScheme != NULL; }
/// serialization
void serialEmitteeSpeedScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialEmitteeSpeedScheme(NLMISC::IStream &f);
protected:
@ -470,7 +470,7 @@ public:
}
/// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterDirectionnal);
@ -506,7 +506,7 @@ class CPSRadialEmitter : public CPSEmitterDirectionnal
if (CParticleSystem::getSerializeIdentifierFlag()) _Name = std::string("RadialEmitter");
}
/// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSRadialEmitter);
virtual void emit(const NLMISC::CVector &srcPos, uint32 index, NLMISC::CVector &pos, NLMISC::CVector &speed);
};
@ -527,7 +527,7 @@ public:
}
/// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterOmni);
@ -561,7 +561,7 @@ class CPSEmitterRectangle : public CPSEmitter, public CPSModulatedEmitter, publi
}
/// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterRectangle);
@ -636,7 +636,7 @@ public:
}
/// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterConic);
@ -675,7 +675,7 @@ public:
}
/// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSSphericalEmitter);

2
code/nel/include/nel/3d/ps_face.h
View file

@ -69,7 +69,7 @@ public:
*/
CPSFace(CSmartPtr<ITexture> tex = NULL);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSFace);
/** Tells that all faces are turning in the same manner, and only have a rotationnal bias

2
code/nel/include/nel/3d/ps_face_look_at.h
View file

@ -40,7 +40,7 @@ public:
*/
CPSFaceLookAt(CSmartPtr<ITexture> tex = NULL);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSFaceLookAt);

2
code/nel/include/nel/3d/ps_fan_light.h
View file

@ -47,7 +47,7 @@ public:
CPSFanLight(uint32 nbFans = 7);
/// Dtor
~CPSFanLight();
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
//@}
// Set the number of fans used for drawing (minimum is 3, maximum is 128)

4
code/nel/include/nel/3d/ps_float.h
View file

@ -104,7 +104,7 @@ class CPSFloatCurveFunctor
CCtrlPoint(float date, float value) : Date(date), Value(value) { nlassert(Date >= 0 && Date <= 1); }
float Date;
float Value;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serial(Date, Value);
}
@ -166,7 +166,7 @@ class CPSFloatCurveFunctor
float getValue(float date) const;
/// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
float getMinValue() const { return _MinValue; }
float getMaxValue() const { return _MaxValue; }

32
code/nel/include/nel/3d/ps_force.h
View file

@ -70,7 +70,7 @@ public:
virtual void show() = 0;
/// Serial the force definition. MUST be called by deriver during their serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/// check whether this force is integrable over time. The default is false
virtual bool isIntegrable(void) const { return false; }
@ -175,7 +175,7 @@ public:
/// get the attribute maker for a non constant intensity
CPSAttribMaker<float> *getIntensityScheme(void) { return _IntensityScheme; }
const CPSAttribMaker<float> *getIntensityScheme(void) const { return _IntensityScheme; }
void serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialForceIntensity(NLMISC::IStream &f);
protected:
@ -209,7 +209,7 @@ protected:
class CPSForceIntensityHelper : public CPSForce, public CPSForceIntensity
{
public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) ;
void serial(NLMISC::IStream &f);
protected:
virtual CPSLocated *getForceIntensityOwner(void) { return _Owner; }
@ -241,7 +241,7 @@ protected:
*
* // you can provide a serialization method. Note that that if the functor parameters are set before each use,
* // it useless to serial something ...
* void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
* void serial(NLMISC::IStream &f)
*
* protected:
* ...
@ -275,7 +275,7 @@ public:
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
CPSForce::serial(f);
@ -354,7 +354,7 @@ class CPSDirectionnalForce : public CPSForceIntensityHelper, public CPSDirection
}
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSDirectionnalForce);
@ -397,7 +397,7 @@ public:
}
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSGravity);
@ -443,7 +443,7 @@ public:
}
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSCentralGravity);
@ -464,7 +464,7 @@ public:
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/// Compute the force on the targets
@ -498,7 +498,7 @@ public:
speed -= (CParticleSystem::EllapsedTime * _K * invMass * speed);
}
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
// we don't save intensity info : it is saved by the owning object (and set before each use of this functor)
@ -539,7 +539,7 @@ public:
NLMISC_DECLARE_CLASS(CPSFluidFriction)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
CIsotropicForceT<CPSFluidFrictionFunctor>::serial(f);
@ -571,7 +571,7 @@ public:
NLMISC_DECLARE_CLASS(CPSBrownianForce)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/// We provide a kind of integration on a predefined sequence
virtual bool isIntegrable(void) const;
@ -648,7 +648,7 @@ struct CPSTurbulForceFunc
*/
}
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
f.serial(_Scale, _NumOctaves);
@ -686,7 +686,7 @@ public:
NLMISC_DECLARE_CLASS(CPSTurbul)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
f.serialVersion(1);
CIsotropicForceT<CPSTurbulForceFunc>::serial(f);
@ -758,7 +758,7 @@ public:
// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
@ -801,7 +801,7 @@ class CPSMagneticForce : public CPSDirectionnalForce
}
virtual void computeForces(CPSLocated &target);
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSMagneticForce);
};

2
code/nel/include/nel/3d/ps_light.h
View file

@ -42,7 +42,7 @@ public:
~CPSLight();
NLMISC_DECLARE_CLASS(CPSLight);
/// Serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
//@}
virtual uint32 getType(void) const;
virtual uint32 getPriority(void) const { return 600; }

6
code/nel/include/nel/3d/ps_located.h
View file

@ -356,7 +356,7 @@ public:
void resize(uint32 newSize);
/// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/// Shortcut to get an instance of the 3d driver
IDriver *getDriver() const;
@ -730,7 +730,7 @@ public:
/// ctor
CPSLocatedBindable();
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/** this should be called before to delete any bindable inserted in a system, but this is done
* by the system, so you should never need calling it. This has been introduced because calls in dtor are not polymorphic
* to derived class (which are already destroyed anyway), and some infos are needed in some dtor. The default behaviour does nothing
@ -1010,7 +1010,7 @@ public:
*/
virtual void releaseTargetRsc(CPSLocated * /* target */) {}
/// Seralization, must be called by derivers
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/// Finalize this object : the default is to call releaseTargetRsc on targets
virtual void finalize(void);
virtual ~CPSTargetLocatedBindable();

8
code/nel/include/nel/3d/ps_mesh.h
View file

@ -82,7 +82,7 @@ public:
std::string getShape(void) const { return _Shape; }
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
virtual ~CPSMesh();
@ -271,7 +271,7 @@ public:
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSConstraintMesh);
@ -334,7 +334,7 @@ public:
float WRotSpeed; /* = 0 */
float WRotAccel; /* = 0 */
CGlobalTexAnim();
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/// Build a texture matrix from a date and this obj.
void buildMatrix(TAnimationTime date, NLMISC::CMatrix &dest);
};
@ -587,7 +587,7 @@ protected:
struct CGlobalTexAnims
{
CGlobalTexAnim Anims[IDRV_MAT_MAXTEXTURES];
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
};
typedef CUniquePtr<CGlobalTexAnims> PGlobalTexAnims;

16
code/nel/include/nel/3d/ps_particle_basic.h
View file

@ -107,7 +107,7 @@ public:
virtual uint32 getNumWantedTris() const = 0;
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
/// version 3 : global color lighting
/// version 2 : auto-lod saved
@ -210,7 +210,7 @@ class CPSColoredParticle
virtual ~CPSColoredParticle();
/// serialization.
void serialColorScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialColorScheme(NLMISC::IStream &f);
protected:
@ -273,7 +273,7 @@ class CPSSizedParticle
virtual ~CPSSizedParticle();
/// serialization. We choose a different name because of multiple-inheritance
void serialSizeScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialSizeScheme(NLMISC::IStream &f);
protected:
@ -335,7 +335,7 @@ class CPSRotated2DParticle
virtual ~CPSRotated2DParticle();
/// serialization. We choose a different name because of multiple-inheritance
void serialAngle2DScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialAngle2DScheme(NLMISC::IStream &f);
@ -453,7 +453,7 @@ class CPSTexturedParticle
virtual ~CPSTexturedParticle();
/// serialization. We choose a different name because of multiple-inheritance
void serialTextureScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialTextureScheme(NLMISC::IStream &f);
void enumTexs(std::vector<NLMISC::CSmartPtr<ITexture> > &dest);
@ -576,7 +576,7 @@ public:
}
/// serial this object
void serialMultiTex(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialMultiTex(NLMISC::IStream &f);
/** setup a material from this object and a primary texture
* drv is used to check the device caps.
@ -683,7 +683,7 @@ class CPSRotated3DPlaneParticle
virtual ~CPSRotated3DPlaneParticle();
/// serialization. We choose a different name because of multiple-inheritance
void serialPlaneBasisScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialPlaneBasisScheme(NLMISC::IStream &f);
protected:
/// if this is false, constant size will be used instead of a scheme
@ -806,7 +806,7 @@ public:
enum TBlendingMode { add, modulate, alphaBlend, alphaTest };
/// serialization (not named 'serial' because it will be used via multiple-inheritance)
void serialMaterial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialMaterial(NLMISC::IStream &f);
/// set the blending mode. The default is ass
void setBlendingMode(CPSMaterial::TBlendingMode mode);

2
code/nel/include/nel/3d/ps_plane_basis.h
View file

@ -66,7 +66,7 @@ struct CPlaneBasis
}
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serial(X, Y) ;
}

4
code/nel/include/nel/3d/ps_plane_basis_maker.h
View file

@ -128,7 +128,7 @@ class CPSPlaneBasisFollowSpeed : public CPSAttribMaker<CPlaneBasis>
NLMISC_DECLARE_CLASS(CPSPlaneBasisFollowSpeed);
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
virtual void serial(NLMISC::IStream &f)
{
// version 2 : added projection plane
// version 1 : nothing to save here
@ -192,7 +192,7 @@ public:
/// get the number of samples for the rotation
uint32 getNumSamples(void) const;
/// serial this object
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
protected:
CPSVector<CPlaneBasis>::V _PBTab;
uint32 _NbSamples;

2
code/nel/include/nel/3d/ps_quad.h
View file

@ -114,7 +114,7 @@ protected:
void updateVbColNUVForRender(CVertexBuffer &vb, uint32 startIndex, uint32 numQuad, uint32 srcStep, IDriver &drv);
/// DERIVERS MUST CALL this
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
virtual CPSLocated *getColorOwner(void) { return _Owner; }
virtual CPSLocated *getSizeOwner(void) { return _Owner; }
virtual CPSLocated *getTextureIndexOwner(void) { return _Owner; }

2
code/nel/include/nel/3d/ps_ribbon.h
View file

@ -55,7 +55,7 @@ public:
/// dtor
~CPSRibbon();
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
//
NLMISC_DECLARE_CLASS(CPSRibbon);
///@}

2
code/nel/include/nel/3d/ps_ribbon_base.h
View file

@ -52,7 +52,7 @@ public:
///@{
CPSRibbonBase();
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
///@}
///\name Behaviour

2
code/nel/include/nel/3d/ps_ribbon_look_at.h
View file

@ -38,7 +38,7 @@ public:
/// dtor
~CPSRibbonLookAt();
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
//
NLMISC_DECLARE_CLASS(CPSRibbonLookAt);
///@}

2
code/nel/include/nel/3d/ps_shockwave.h
View file

@ -54,7 +54,7 @@ public:
float getRadiusCut(void) const { return _RadiusCut; }
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSShockWave);

2
code/nel/include/nel/3d/ps_sound.h
View file

@ -50,7 +50,7 @@ public:
/// dtor
~CPSSound();
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
//@}
/// return this bindable type

2
code/nel/include/nel/3d/ps_tail_dot.h
View file

@ -37,7 +37,7 @@ public:
/// dtor
~CPSTailDot();
/// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
//
NLMISC_DECLARE_CLASS(CPSTailDot);
///@}

14
code/nel/include/nel/3d/ps_zone.h
View file

@ -82,7 +82,7 @@ public:
/// serialization, DERIVER must override this, and call the parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/** Inherited from CPSTargetLocatedBindable. It's called when one of the targets has been detroyed or detached
@ -155,7 +155,7 @@ class CPSZonePlane : public CPSZone, public IPSMover
virtual NLMISC::CVector getNormal(uint32 index);
virtual void setNormal(uint32 index, NLMISC::CVector n);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
protected:
TPSAttribVector _Normal;
@ -176,7 +176,7 @@ struct CRadiusPair
{
// the adius, and the square radius
float R, R2;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void serial(NLMISC::IStream &f)
{
f.serial(R, R2);
}
@ -205,7 +205,7 @@ class CPSZoneSphere : public CPSZone, public IPSMover
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
// inherited from IPSMover
@ -257,7 +257,7 @@ class CPSZoneDisc : public CPSZone, public IPSMover
virtual NLMISC::CVector getNormal(uint32 index);
virtual void setNormal(uint32 index, NLMISC::CVector n);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
@ -303,7 +303,7 @@ class CPSZoneCylinder : public CPSZone, public IPSMover
virtual NLMISC::CVector getScale(uint32 k) const;
// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
@ -350,7 +350,7 @@ class CPSZoneRectangle : public CPSZone, public IPSMover
// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
// inherited from IPSMover
virtual bool supportUniformScaling(void) const { return true; }

2
code/nel/include/nel/3d/seg_remanence_shape.h
View file

@ -70,7 +70,7 @@ public:
// assignement
CSegRemanenceShape &operator = (const CSegRemanenceShape &other);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CSegRemanenceShape);
//@}

2
code/nel/include/nel/3d/shape.h
View file

@ -201,7 +201,7 @@ public:
IShape* getShapePointer () const;
/// serial the shape.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
private:
IShape* _Shape;
};

4
code/nel/include/nel/3d/skeleton_shape.h
View file

@ -49,7 +49,7 @@ public:
std::vector<uint8> ActiveBones;
public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
};
public:
@ -94,7 +94,7 @@ public:
virtual float getNumTriangles (float distance);
/// serial this skeletonshape.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CSkeletonShape);
/// flush textures used by this shape.

2
code/nel/include/nel/3d/texture.h
View file

@ -359,7 +359,7 @@ public:
virtual bool allowDegradation() const { return false; }
/// serial ITexture basic infos (clamp ...).
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/** Select a texture among several other (if this texture is a set of texture such as CTextureMultiFile)
* The default does nothing

2
code/nel/include/nel/3d/texture_blend.h
View file

@ -74,7 +74,7 @@ public:
virtual void release();
// serial this texture datas
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
private:
uint16 _BlendFactor;

2
code/nel/include/nel/3d/texture_bump.h
View file

@ -47,7 +47,7 @@ public:
const ITexture *getHeightMap() const { return _HeightMap; };
// serial this texture datas
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
virtual bool supportSharing() const;

2
code/nel/include/nel/3d/texture_cube.h
View file

@ -77,7 +77,7 @@ public:
virtual bool isTextureCube() const { return true; }
/// Save the texture file name.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CTextureCube);
/// If the face support multiple texture (such has CTextureMultiFile), this allow to select the active set

2
code/nel/include/nel/3d/texture_dlm.h
View file

@ -81,7 +81,7 @@ public:
/// TextureDLM are system. Do not need to serialize them...
// default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called...
CTextureDLM() {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureDLM);

2
code/nel/include/nel/3d/texture_emboss.h
View file

@ -46,7 +46,7 @@ public:
const ITexture *getHeightMap() const { return _HeightMap; };
// serial this texture datas
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
virtual bool supportSharing() const;
virtual std::string getShareName() const;
//

2
code/nel/include/nel/3d/texture_far.h
View file

@ -185,7 +185,7 @@ private:
void rebuildPatch (const CVector2s texturePos, const CPatchIdent &pid);
/// From IStreamable
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {}
virtual void serial(NLMISC::IStream &/* f */) {}
// Some static buffers
static NLMISC::CRGBA _LightmapExpanded[];

2
code/nel/include/nel/3d/texture_file.h
View file

@ -122,7 +122,7 @@ public:
void doGenerate(bool async = false);
/// Save the texture file name.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CTextureFile);

2
code/nel/include/nel/3d/texture_font.h
View file

@ -112,7 +112,7 @@ private:
/// Todo: serialize a font texture.
public:
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureFont);
};

2
code/nel/include/nel/3d/texture_grouped.h
View file

@ -111,7 +111,7 @@ public:
void doGenerate(bool async = false);
/// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
/// a group of 4 uvs

2
code/nel/include/nel/3d/texture_mem.h
View file

@ -160,7 +160,7 @@ public:
void setAllowDegradation(bool allow);
/// Todo: serialize a mem texture.
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureMem);
/** This create a white square texture of 1x1

2
code/nel/include/nel/3d/texture_multi_file.h
View file

@ -70,7 +70,7 @@ public:
/// Generate the current selected texture, looking in CPath if necessary.
virtual void doGenerate(bool async = false);
/// Serial this object
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CTextureMultiFile);
private:

2
code/nel/include/nel/3d/texture_near.h
View file

@ -77,7 +77,7 @@ public:
/// TextureNear are system. Do not need to serialize them...
// default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called...
CTextureNear() {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureNear);
private:

12
code/nel/include/nel/3d/tile_bank.h
View file

@ -77,7 +77,7 @@ public:
{
return (_Flags&NL3D_CTILE_FREE_FLAG)!=0;
}
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
void setFileName (TBitmap bitmapType, const std::string& name)
{
// not free
@ -180,7 +180,7 @@ public:
void clear(){ _TileSet.clear(); }
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
private:
// internal use
@ -210,7 +210,7 @@ public:
{
return _Tile;
}
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
private:
sint32 _Tile;
@ -236,7 +236,7 @@ public:
void doubleSize ();
bool operator== (const CTileBorder& border) const;
void operator= (const CTileBorder& border);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
bool isSet() const
{
return _Set;
@ -416,7 +416,7 @@ public:
{
return _ChildName.find(name)!=_ChildName.end();
}
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
private:
static TFlagBorder getComplementaryBorder (TFlagBorder border);
@ -629,7 +629,7 @@ public:
/// Postfix tile vegetable desc
void postfixTileVegetableDesc (const char *filename);
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
private:
sint createTile ();
void freeTile (int tileIndex);

4
code/nel/include/nel/3d/tile_far_bank.h
View file

@ -94,7 +94,7 @@ public:
}
/// Serial this tile
void serial (class NLMISC::IStream &f) throw(NLMISC::EStream);
void serial (NLMISC::IStream &f);
private:
/// RGBA Pixels vector
@ -141,7 +141,7 @@ public:
}
/// Serial this bank
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/// The far tile vector
std::vector<CTileFar> _TileVector;

4
code/nel/include/nel/3d/track.h
View file

@ -166,7 +166,7 @@ public:
/// Serial the template
virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
virtual void serial (NLMISC::IStream& f)
{
// Serial version
(void)f.serialVersion (0);
@ -217,7 +217,7 @@ public:
/// Serial the template
virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
virtual void serial (NLMISC::IStream& f)
{
// Serial version
(void)f.serialVersion (0);

2
code/nel/include/nel/3d/track_keyframer.h
View file

@ -237,7 +237,7 @@ public:
/// Serial the template
virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
virtual void serial (NLMISC::IStream& f)
{
// Serial version
(void)f.serialVersion (0);

2
code/nel/include/nel/3d/water_height_map.h
View file

@ -168,7 +168,7 @@ public:
sint64 Date;
/// serial the pools data's
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/// Set this pool name.
void setName(const std::string &name) { _Name = name; }

2
code/nel/include/nel/3d/water_pool_manager.h
View file

@ -97,7 +97,7 @@ public:
/// serial the pools data's
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
private:
friend class CWaterShape;

4
code/nel/include/nel/3d/water_shape.h
View file

@ -108,7 +108,7 @@ public:
/// serial this shape
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
//@}
@ -299,7 +299,7 @@ public:
/// serial this shape
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
//@}

8
code/nel/include/nel/logic/logic_condition.h
View file

@ -79,7 +79,7 @@ public:
/**
* serial
*/
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const;
void read (xmlNodePtr node);
@ -160,7 +160,7 @@ public:
/**
* serial
*/
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const;
void read (xmlNodePtr node);
@ -239,7 +239,7 @@ public:
/**
* serial
*/
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
/**
* Destructor
@ -323,7 +323,7 @@ public:
/**
* serial
*/
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const;
void read (xmlNodePtr node);

6
code/nel/include/nel/logic/logic_event.h
View file

@ -79,7 +79,7 @@ public:
/**
* serial
*/
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
void write (xmlNodePtr node, const char *subName = "") const;
void read (xmlNodePtr node, const char *subName = "");
@ -122,7 +122,7 @@ public:
/**
* serial
*/
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const;
void read (xmlNodePtr node);
@ -181,7 +181,7 @@ public:
/**
* serial
*/
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const;
void read (xmlNodePtr node);

2
code/nel/include/nel/logic/logic_state.h
View file

@ -149,7 +149,7 @@ public:
/**
* serial
*/
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const;
void read (xmlNodePtr node);

2
code/nel/include/nel/logic/logic_state_machine.h
View file

@ -182,7 +182,7 @@ public:
/**
* serial
*/
//void serial( NLMISC::IStream &f ) throw(NLMISC::EStream);
//void serial( NLMISC::IStream &f );
/**
* Display the variables

4
code/nel/include/nel/logic/logic_variable.h
View file

@ -104,7 +104,7 @@ public:
/**
* serial
*/
//virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
//virtual void serial(NLMISC::IStream &f);
virtual void write (xmlNodePtr node) const;
virtual void read (xmlNodePtr node);
@ -186,7 +186,7 @@ public:
/**
* serial
*/
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
//void serial(NLMISC::IStream &f);
virtual void write (xmlNodePtr node) const;
virtual void read (xmlNodePtr node);

8
code/nel/include/nel/misc/algo.h
View file

@ -211,6 +211,14 @@ bool strFindReplace(T &str, const char *strFind, const U &strReplace)
return strFindReplace(str, tempStr, strReplace);
}
template<class T>
T strFindReplaceAll(const T &str, const T &search, const T &replace)
{
T ret = str;
while (strFindReplace(ret, search, replace));
return ret;
}
// set flags in a bit set
template <class T, class U>
inline void setFlags(T &dest, U mask, bool on)

4
code/nel/include/nel/misc/array_2d.h
View file

@ -132,7 +132,7 @@ public:
// See which parts of array will be discarded if the array is displaced by the given offset
void getDiscardRects(sint moveOffsetX, sint moveOffsetY, std::vector<NLMISC::CRect> &discardedRects);
//
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
private:
TArrayContainer _Array;
uint _Width;
@ -157,7 +157,7 @@ void CArray2D<T>::clear()
//*********************************************************************************
template <class T>
void CArray2D<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CArray2D<T>::serial(NLMISC::IStream &f)
{
f.serialCont(_Array);
uint32 width = _Width;

23
code/nel/include/nel/misc/common.h
View file

@ -233,6 +233,26 @@ char toLower ( const char ch ); // convert only one character
std::string toUpper ( const std::string &str);
void toUpper ( char *str);
/**
* Convert to an hexadecimal std::string
*/
std::string toHexa(const uint8 &b);
std::string toHexa(const uint8 *data, uint size);
std::string toHexa(const std::string &str);
std::string toHexa(const char *str);
/**
* Convert from an hexadecimal std::string
*/
bool fromHexa(const std::string &hexa, uint8 &b);
bool fromHexa(const std::string &hexa, uint8 *data);
bool fromHexa(const std::string &hexa, std::string &str);
bool fromHexa(const char *hexa, uint8 &b);
bool fromHexa(const char *hexa, uint8 *data);
bool fromHexa(const char *hexa, std::string &str);
bool fromHexa(const char hexa, uint8 &b);
// Remove all the characters <= 32 (tab, space, new line, return, vertical tab etc..) at the beginning and at the end of a string
template <class T> T trim (const T &str)
{
@ -394,6 +414,9 @@ std::string expandEnvironmentVariables(const std::string &s);
bool explodeArguments(const std::string &str, std::vector<std::string> &args);
std::string joinArguments(const std::vector<std::string> &args);
/// Escape an argument to not evaluate environment variables or special cases
std::string escapeArgument(const std::string &arg);
/// This function kills a program using his pid (on unix, it uses the kill() POSIX function)
bool killProgram(uint32 pid);

4
code/nel/include/nel/misc/entity_id.h
View file

@ -450,8 +450,8 @@ public:
}
void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
// virtual void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
void serial (NLMISC::IStream &f)
// virtual void serial (NLMISC::IStream &f)
{
if (f.isReading ())
{

2
code/nel/include/nel/misc/fixed_size_allocator.h
View file

@ -53,7 +53,7 @@ public:
uint getNumAllocatedBlocks() const { return _NumAlloc; }
private:
class CChunk;
class NL_ALIGN(NL_DEFAULT_MEMORY_ALIGNMENT) CNode
{
public:

2
code/nel/include/nel/misc/mouse_smoother.h
View file

@ -46,7 +46,7 @@ public:
double getSamplingPeriod() const { return _SamplingPeriod; }
// Reset smoother. The next returned position will be the exact position of mouse (no smoothing with previous position is done)
void reset();
// \return trueif no sampling has occurred since last resetor construction
// \return true if no sampling has occurred since last resetor construction
bool isReseted() const { return !_Init; }
// Sample pos, and return smoothed position
CVector2f samplePos(const CVector2f &wantedPos, double date);

4
code/nel/include/nel/misc/polygon.h
View file

@ -66,7 +66,7 @@ public:
float computeArea() const;
/// Serial this polygon
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
/**
* Convert a concave polygon into a list of convex polygons using a 2d projection.
@ -156,7 +156,7 @@ public:
void getBestTriplet(uint &index0, uint &index1, uint &index2);
/// Serial this polygon
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
typedef std::pair<sint, sint> TRaster;
typedef std::vector<TRaster> TRasterVect;

6
code/nel/include/nel/misc/rgba.h
View file

@ -86,7 +86,7 @@ public:
* Serialisation.
* \param f Stream used for serialisation.
*/
void serial (class NLMISC::IStream &f);
void serial (NLMISC::IStream &f);
/**
* Blend two colors.
@ -451,7 +451,7 @@ public:
* Serialisation.
* \param f Stream used for serialisation.
*/
void serial(class NLMISC::IStream &f);
void serial(NLMISC::IStream &f);
/**
* Blend two colors.
@ -676,7 +676,7 @@ public:
* Serialisation.
* \param f Stream used for serialisation.
*/
void serial(class NLMISC::IStream &f);
void serial(NLMISC::IStream &f);
/**
* Set colors.

4
code/nel/include/nel/misc/sheet_id.h
View file

@ -146,8 +146,8 @@ public :
/**
* Serial
*/
void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
void serialString(NLMISC::IStream &f, const std::string &defaultType = "") throw(NLMISC::EStream);
void serial(NLMISC::IStream &f);
void serialString(NLMISC::IStream &f, const std::string &defaultType = "");
/**
* Display the list of valid sheet ids with their associated file names

74
code/nel/src/3d/driver/direct3d/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h>
#include "config.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "NeL Direct3D driver"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_direct3d_win_d.dll"
#else
VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END
#include <windows.h>
#include "config.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "NeL Direct3D driver"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_direct3d_win_d.dll"
#else
VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END

8
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -1195,11 +1195,11 @@ sint CDriverGL::getTotalVideoMemory() const
if (_Extensions.ATIMeminfo)
{
GLint memoryInKiB = 0;
glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, &memoryInKiB);
GLint params[4];
glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, params);
nlinfo("3D: GL_TEXTURE_FREE_MEMORY_ATI returned %d KiB", memoryInKiB);
return memoryInKiB;
nlinfo("3D: GL_TEXTURE_FREE_MEMORY_ATI returned %d KiB", params[0]);
return params[0];
}
#if defined(NL_OS_WINDOWS)

2
code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
View file

@ -635,7 +635,7 @@ bool CDriverGL::renderRawQuads(CMaterial& mat, uint32 startIndex, uint32 numQuad
nlerror("not available in OpenGL ES 1.0, only use 16 bits indices");
#else
// indices fits on 32 bits
GLint indices[QUAD_BATCH_SIZE];
GLint indices[QUAD_BATCH_SIZE * 6];
GLint *curr = indices;
GLint *end = indices + 6 * numQuadsToDraw;
uint32 vertexIndex = currIndex;

74
code/nel/src/3d/driver/opengl/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h>
#include "config.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "NeL OpenGL driver"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll"
#else
VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END
#include <windows.h>
#include "config.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "NeL OpenGL driver"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll"
#else
VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END

2
code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
View file

@ -83,8 +83,6 @@ void CUnixEventEmitter::createIM()
{
#ifdef X_HAVE_UTF8_STRING
XModifierKeymap *g_mod_map = XGetModifierMapping(_dpy);
_im = XOpenIM(_dpy, NULL, NULL, NULL);
if (_im == NULL)

74
code/nel/src/3d/driver/opengles/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h>
#include "config.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "NeL OpenGL ES 1.1 driver"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_opengles_win_d.dll"
#else
VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END
#include <windows.h>
#include "config.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "NeL OpenGL ES 1.1 driver"
VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_opengles_win_d.dll"
#else
VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll"
#endif
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END

2
code/nel/src/3d/flare_shape.cpp
View file

@ -63,7 +63,7 @@ CFlareShape::CFlareShape() : _Color(NLMISC::CRGBA::White),
// ***************************************************************************************************************
void CFlareShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CFlareShape::serial(NLMISC::IStream &f)
{
// Version 4 : - added occlusion test mesh, size reduction, angle modification when object is occluded
// - added lookat mode for first flare

18
code/nel/src/3d/font_generator.cpp
View file

@ -271,7 +271,14 @@ void CFontGenerator::getSizes (ucchar c, uint32 size, uint32 &width, uint32 &hei
error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
if (error)
{
nlerror ("FT_Load_Glyph() failed: %s", getFT2Error(error));
// use fallback for glyph/character errors (composite char limit for example)
nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
if (error)
{
nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
}
}
// convert 24.6 fixed point into integer
@ -302,7 +309,14 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
if (error)
{
nlerror ("FT_Load_Glyph() failed: %s", getFT2Error(error));
// use fallback for glyph/character errors (composite char limit for example)
nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
if (error)
{
nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
}
}
if (size == 0)

2
code/nel/src/3d/landscape.cpp
View file

@ -139,7 +139,7 @@ public:
}
// Dummy serial...
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) { nlstop; }
NLMISC_DECLARE_CLASS(CTextureCross);
};

12
code/nel/src/3d/mesh.cpp
View file

@ -861,7 +861,7 @@ void CMeshGeom::renderSimpleWithMaterial(IDriver *drv, const CMatrix &worldMatri
// ***************************************************************************
void CMeshGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshGeom::serial(NLMISC::IStream &f)
{
/* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@ -2389,7 +2389,7 @@ CMesh::CCorner::CCorner()
// ***************************************************************************
void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMesh::CCorner::serial(NLMISC::IStream &f)
{
nlassert(0); // not used
f.serial(Vertex);
@ -2400,7 +2400,7 @@ void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
}
// ***************************************************************************
void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMesh::CFace::serial(NLMISC::IStream &f)
{
for(int i=0;i<3;++i)
f.serial(Corner[i]);
@ -2409,7 +2409,7 @@ void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
}
// ***************************************************************************
void CMesh::CSkinWeight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMesh::CSkinWeight::serial(NLMISC::IStream &f)
{
for(int i=0;i<NL3D_MESH_SKINNING_MAX_MATRIX;++i)
{
@ -2420,7 +2420,7 @@ void CMesh::CSkinWeight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
// ***************************************************************************
/* Serialization is not used.
void CMesh::CMeshBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMesh::CMeshBuild::serial(NLMISC::IStream &f)
{
sint ver= f.serialVersion(0);
@ -2604,7 +2604,7 @@ void CMesh::render(IDriver *drv, CTransformShape *trans, bool passOpaque)
// ***************************************************************************
void CMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMesh::serial(NLMISC::IStream &f)
{
/* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance

4
code/nel/src/3d/mesh_base.cpp
View file

@ -139,7 +139,7 @@ CMeshBase::CMeshBaseBuild::CMeshBaseBuild()
// ***************************************************************************
#if 0
void CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f)
{
/*
Version 1:
@ -164,7 +164,7 @@ void CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream
#endif
// ***************************************************************************
void CMeshBase::serialMeshBase(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshBase::serialMeshBase(NLMISC::IStream &f)
{
/* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance

4
code/nel/src/3d/mesh_morpher.cpp
View file

@ -32,7 +32,7 @@ namespace NL3D
{
// ***************************************************************************
void CBlendShape::serial (NLMISC::IStream &f) throw(NLMISC::EStream)
void CBlendShape::serial (NLMISC::IStream &f)
{
/* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@ -345,7 +345,7 @@ void CMeshMorpher::updateSkinned (std::vector<CAnimatedMorph> *pBSFactor)
}
// ***************************************************************************
void CMeshMorpher::serial (NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshMorpher::serial (NLMISC::IStream &f)
{
/* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance

10
code/nel/src/3d/mesh_mrm.cpp
View file

@ -1604,7 +1604,7 @@ void CMeshMRMGeom::updateShiftedTriangleCache(CMeshMRMInstance *mi, sint curLodI
// ***************************************************************************
void CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshMRMGeom::serial(NLMISC::IStream &f)
{
// because of complexity, serial is separated in save / load.
@ -1618,7 +1618,7 @@ void CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
// ***************************************************************************
sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream)
sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f)
{
/*
Version 5:
@ -1748,7 +1748,7 @@ sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream)
// ***************************************************************************
void CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshMRMGeom::load(NLMISC::IStream &f)
{
// Load the header of the stream.
// ==================
@ -1778,7 +1778,7 @@ void CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream)
// ***************************************************************************
void CMeshMRMGeom::save(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshMRMGeom::save(NLMISC::IStream &f)
{
/*
Version 5:
@ -2968,7 +2968,7 @@ void CMeshMRM::render(IDriver *drv, CTransformShape *trans, bool passOpaque)
// ***************************************************************************
void CMeshMRM::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshMRM::serial(NLMISC::IStream &f)
{
/*
Version 0:

4
code/nel/src/3d/mesh_multi_lod.cpp
View file

@ -288,7 +288,7 @@ void CMeshMultiLod::render(IDriver *drv, CTransformShape *trans, bool passOpaque
// ***************************************************************************
void CMeshMultiLod::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshMultiLod::serial(NLMISC::IStream &f)
{
/* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@ -405,7 +405,7 @@ void CMeshMultiLod::clear ()
// ***************************************************************************
void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f)
{
// Check version
(void)f.serialVersion (0);

Some files were not shown because too many files have changed in this diff Show more