Merge with feature-crashreport

code/CMakeLists.txt

@@ -112,16 +112,20 @@ IF(WITH_STATIC_LIBXML2)
   SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
 ENDIF(WITH_STATIC_LIBXML2)
 
+IF(WITH_LIBXML2_ICONV)
+  FIND_PACKAGE(Iconv REQUIRED)
+  INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
+  SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES})
+ENDIF(WITH_LIBXML2_ICONV)
+
 IF(WITH_STATIC)
   # libxml2 could need winsock2 library
   SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${WINSOCK2_LIB})
 
   # on Mac OS X libxml2 requires iconv and liblzma
   IF(APPLE)
-    FIND_PACKAGE(Iconv REQUIRED)
     FIND_PACKAGE(LibLZMA REQUIRED)
-    SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES} ${LIBLZMA_LIBRARIES})
+    SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
-    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
   ENDIF(APPLE)
 ENDIF(WITH_STATIC)
 
@@ -152,9 +156,11 @@ IF(WITH_NEL)
     FIND_PACKAGE(Luabind REQUIRED)
     FIND_PACKAGE(CURL REQUIRED)
 
-    IF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+    IF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
       SET(CURL_STATIC ON)
-    ENDIF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+    ELSE((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
+      SET(CURL_STATIC OFF)
+    ENDIF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
 
     IF(CURL_STATIC)
       SET(CURL_DEFINITIONS -DCURL_STATICLIB)

code/CMakeModules/FindIconv.cmake

@@ -1,4 +1,4 @@
-# - Try to find Iconv on Mac OS X
+# - Try to find Iconv 
 # Once done this will define 
 # 
 #  ICONV_FOUND - system has Iconv 
@@ -6,78 +6,59 @@
 #  ICONV_LIBRARIES - Link these to use Iconv 
 #  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
 # 
+include(CheckCCompilerFlag)
+include(CheckCSourceCompiles)
 
-IF(APPLE)
+IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-  include(CheckCCompilerFlag)
+  # Already in cache, be silent
-  include(CheckCSourceCompiles)
+  SET(ICONV_FIND_QUIETLY TRUE)
+ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 
-  IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) 
-    # Already in cache, be silent
-    SET(ICONV_FIND_QUIETLY TRUE)
-  ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
  
-  IF(APPLE)
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c PATHS /opt/local)
-      FIND_PATH(ICONV_INCLUDE_DIR iconv.h
-               PATHS
-               /opt/local/include/
-               NO_CMAKE_SYSTEM_PATH
-      )
  
-      FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c
+IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-               PATHS
+   SET(ICONV_FOUND TRUE) 
-               /opt/local/lib/
+ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-               NO_CMAKE_SYSTEM_PATH
-      )
-  ENDIF(APPLE)
 
-  FIND_PATH(ICONV_INCLUDE_DIR iconv.h PATHS /opt/local/include /sw/include)
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
+IF(ICONV_FOUND)
+  check_c_compiler_flag("-Werror" ICONV_HAVE_WERROR)
+  set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
+  if(ICONV_HAVE_WERROR)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+  endif(ICONV_HAVE_WERROR)
+  check_c_source_compiles("
+  #include <iconv.h>
+  int main(){
+    iconv_t conv = 0;
+    const char* in = 0;
+    size_t ilen = 0;
+    char* out = 0;
+    size_t olen = 0;
+    iconv(conv, &in, &ilen, &out, &olen);
+    return 0;
+  }
+" ICONV_SECOND_ARGUMENT_IS_CONST )
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
+ENDIF(ICONV_FOUND)
+set(CMAKE_REQUIRED_INCLUDES)
+set(CMAKE_REQUIRED_LIBRARIES)
 
-  string(REGEX REPLACE "(.*)/include/?" "\\1" ICONV_INCLUDE_BASE_DIR "${ICONV_INCLUDE_DIR}")
+IF(ICONV_FOUND) 
+  IF(NOT ICONV_FIND_QUIETLY) 
+    MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
+  ENDIF(NOT ICONV_FIND_QUIETLY) 
+ELSE(ICONV_FOUND) 
+  IF(Iconv_FIND_REQUIRED) 
+    MESSAGE(FATAL_ERROR "Could not find Iconv") 
+  ENDIF(Iconv_FIND_REQUIRED) 
+ENDIF(ICONV_FOUND) 
 
-  FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c HINTS "${ICONV_INCLUDE_BASE_DIR}/lib" PATHS /opt/local/lib)
+MARK_AS_ADVANCED(
-   
+  ICONV_INCLUDE_DIR
-  IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+  ICONV_LIBRARIES
-     SET(ICONV_FOUND TRUE) 
+  ICONV_SECOND_ARGUMENT_IS_CONST
-  ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+)
-  
-  set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-  set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-  IF(ICONV_FOUND)
-    check_c_compiler_flag("-Werror" ICONV_HAVE_WERROR)
-    set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
-    if(ICONV_HAVE_WERROR)
-      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-    endif(ICONV_HAVE_WERROR)
-    check_c_source_compiles("
-    #include <iconv.h>
-    int main(){
-      iconv_t conv = 0;
-      const char* in = 0;
-      size_t ilen = 0;
-      char* out = 0;
-      size_t olen = 0;
-      iconv(conv, &in, &ilen, &out, &olen);
-      return 0;
-    }
-  " ICONV_SECOND_ARGUMENT_IS_CONST )
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
-  ENDIF(ICONV_FOUND)
-  set(CMAKE_REQUIRED_INCLUDES)
-  set(CMAKE_REQUIRED_LIBRARIES)
-  
-  IF(ICONV_FOUND) 
-    IF(NOT ICONV_FIND_QUIETLY) 
-      MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
-    ENDIF(NOT ICONV_FIND_QUIETLY) 
-  ELSE(ICONV_FOUND) 
-    IF(Iconv_FIND_REQUIRED) 
-      MESSAGE(FATAL_ERROR "Could not find Iconv") 
-    ENDIF(Iconv_FIND_REQUIRED) 
-  ENDIF(ICONV_FOUND) 
-  
-  MARK_AS_ADVANCED(
-    ICONV_INCLUDE_DIR
-    ICONV_LIBRARIES
-    ICONV_SECOND_ARGUMENT_IS_CONST
-  )
-ENDIF(APPLE)

code/CMakeModules/FindLibOVR.cmake

@@ -38,7 +38,7 @@ ELSEIF(WIN32)
 ENDIF(UNIX)
 
 FIND_LIBRARY(LIBOVR_LIBRARY
-  NAMES ovr
+  NAMES ovr libovr
   PATHS
   $ENV{LIBOVR_DIR}/${LIBOVR_LIBRARY_BUILD_PATH}
   /usr/local/lib

code/CMakeModules/FindLuabind.cmake

@@ -69,14 +69,48 @@ FIND_PATH(LUABIND_INCLUDE_DIR
   /opt/include
 )
 
-SET(LIBRARY_NAME_RELEASE luabind libluabind)
+SET(LIBRARY_NAME_RELEASE)
-SET(LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+SET(LIBRARY_NAME_DEBUG)
+
+IF(WITH_LUA52)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua52)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua52d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua52)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua52d)
+ENDIF()
+
+IF(WITH_LUA51)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua51)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua51d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua51)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua51d)
+ENDIF()
+
+IF(WITH_LUA50)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua50)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua50d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua50)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua50d)
+ENDIF()
 
 IF(WITH_STLPORT)
-  SET(LIBRARY_NAME_RELEASE luabind_stlport ${LIBRARY_NAME_RELEASE})
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport)
-  SET(LIBRARY_NAME_DEBUG luabind_stlportd ${LIBRARY_NAME_DEBUG})
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlportd)
 ENDIF(WITH_STLPORT)
 
+# generic libraries names
+LIST(APPEND LIBRARY_NAME_RELEASE luabind libluabind)
+LIST(APPEND LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+
 FIND_LIBRARY(LUABIND_LIBRARY_RELEASE
   NAMES ${LIBRARY_NAME_RELEASE}
   PATHS

code/CMakeModules/FindMSVC.cmake

@@ -62,7 +62,7 @@ IF(MSVC12)
   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(NOT MSVC11_REDIST_DIR)
+  ENDIF(NOT MSVC12_REDIST_DIR)
 ELSEIF(MSVC11)
   DETECT_VC_VERSION("11.0")
   SET(MSVC_TOOLSET "110")

code/CMakeModules/nel.cmake

@@ -255,6 +255,16 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   ELSE(WITH_STATIC)
     OPTION(WITH_STATIC_LIBXML2    "With static libxml2"                           OFF)
   ENDIF(WITH_STATIC)
+  IF (WITH_STATIC)
+    OPTION(WITH_STATIC_CURL       "With static curl"                              ON )
+  ELSE(WITH_STATIC)
+    OPTION(WITH_STATIC_CURL       "With static curl"                              OFF)
+  ENDIF(WITH_STATIC)
+  IF(APPLE)
+    OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      ON )
+  ELSE(APPLE)
+    OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      OFF)
+  ENDIF(APPLE)
   OPTION(WITH_STATIC_DRIVERS      "With static drivers."                          OFF)
   IF(WIN32)
     OPTION(WITH_EXTERNAL          "With provided external."                       ON )
@@ -363,6 +373,7 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
   ###
   OPTION(WITH_LUA51               "Build Ryzom Core using Lua 5.1"                ON )
   OPTION(WITH_LUA52               "Build Ryzom Core using Lua 5.2"                OFF)
+  OPTION(WITH_RYZOM_CLIENT_UAC    "Ask to run as Administrator"                   OFF)
 ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
 
 MACRO(NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS)
@@ -557,9 +568,15 @@ MACRO(NL_SETUP_BUILD)
     # Ignore default include paths
     ADD_PLATFORM_FLAGS("/X")
 
-    IF(MSVC11)
+    IF(MSVC12)
       ADD_PLATFORM_FLAGS("/Gy- /MP")
-      # /Ox is working with VC++ 2010, but custom optimizations don't exist
+      # /Ox is working with VC++ 2013, but custom optimizations don't exist
+      SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
+      # without inlining it's unusable, use custom optimizations again
+      SET(DEBUG_CFLAGS "/Od /Ob1 /GF- ${DEBUG_CFLAGS}")
+    ELSEIF(MSVC11)
+      ADD_PLATFORM_FLAGS("/Gy- /MP")
+      # /Ox is working with VC++ 2012, but custom optimizations don't exist
       SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
       # without inlining it's unusable, use custom optimizations again
       SET(DEBUG_CFLAGS "/Od /Ob1 /GF- ${DEBUG_CFLAGS}")
@@ -581,9 +598,9 @@ MACRO(NL_SETUP_BUILD)
       SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
       # without inlining it's unusable, use custom optimizations again
       SET(DEBUG_CFLAGS "/Od /Ob1 ${DEBUG_CFLAGS}")
-    ELSE(MSVC11)
+    ELSE(MSVC12)
       MESSAGE(FATAL_ERROR "Can't determine compiler version ${MSVC_VERSION}")
-    ENDIF(MSVC11)
+    ENDIF(MSVC12)
 
     ADD_PLATFORM_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250")
 

code/nel/include/nel/3d/driver.h

@@ -493,7 +493,7 @@ public:
 	 *
 	 * NB: you must setupViewMatrix() BEFORE setupModelMatrix(), or else undefined results.
 	 */
-	virtual void			setupViewMatrix(const CMatrix &mtx)=0;
+	virtual void			setupViewMatrix(const CMatrix &mtx) = 0;
 
 	/** setup the view matrix (inverse of camera matrix).
 	 *	Extended: give a cameraPos (mtx.Pos() is not taken into account but for getViewMatrix()),
@@ -1422,7 +1422,6 @@ protected:
 
 private:
 	bool					_StaticMemoryToVRAM;
-
 };
 
 // --------------------------------------------------

code/nel/include/nel/gui/ctrl_base.h

@@ -50,6 +50,8 @@ namespace NLGUI
 			// see interface.txt for meaning of auto
 			_ToolTipParentPosRef= Hotspot_TTAuto;
 			_ToolTipPosRef= Hotspot_TTAuto;
+			_EventX = 0;
+			_EventY = 0;
 			resizer = false;
 		}
 
@@ -70,6 +72,9 @@ namespace NLGUI
 
 		bool handleEvent (const NLGUI::CEventDescriptor &event);
 
+		sint32 getEventX() { return _EventX; }
+		sint32 getEventY() { return _EventY; }
+
 		virtual CCtrlBase	*getSubCtrl (sint32 /* x */, sint32 /* y */) { return this; }
 
 		/// Debug
@@ -181,6 +186,9 @@ namespace NLGUI
 		static std::map< std::string, std::map< std::string, std::string > > AHCache;
 
 		bool resizer;
+
+		sint32 _EventX;
+		sint32 _EventY;
 	};
 
 }

code/nel/include/nel/gui/dbgroup_combo_box.h

@@ -60,7 +60,7 @@ namespace NLGUI
 		void			setText(uint i, const ucstring &text);
 		void			insertText(uint i, const ucstring &text);
 		const ucstring	&getText(uint i) const;
-		const uint		&getTextId(uint i) const;
+		uint			getTextId(uint i) const;
 		uint			getTextPos(uint nId) const;
 		const ucstring	&getTexture(uint i) const;
 		void			removeText(uint nPos);

code/nel/include/nel/gui/group_html.h

@@ -17,7 +17,6 @@
 #ifndef CL_GROUP_HTML_H
 #define CL_GROUP_HTML_H
 
-#define CURL_STATICLIB 1
 #include <curl/curl.h>
 
 #include "nel/misc/types_nl.h"
@@ -107,7 +106,7 @@ namespace NLGUI
 		void refresh();
 
 		// submit form
-		void submitForm (uint formId, const char *submitButtonName);
+		void submitForm (uint formId, const char *submitButtonType, const char *submitButtonName, const char *submitButtonValue, sint32 x, sint32 y);
 
 		// Browse error
 		void browseError (const char *msg);
@@ -328,7 +327,11 @@ namespace NLGUI
 		bool			_BrowseNextTime;
 		bool			_PostNextTime;
 		uint			_PostFormId;
+		std::string		_PostFormSubmitType;
 		std::string		_PostFormSubmitButton;
+		std::string		_PostFormSubmitValue;
+		sint32			_PostFormSubmitX;
+		sint32			_PostFormSubmitY;
 
 		// Browsing..
 		bool			_Browsing;

code/nel/include/nel/gui/lua_object.h

@@ -285,8 +285,7 @@ namespace NLGUI
 	class CLuaHashMapTraits
 	{
 	public:
-		static const size_t bucket_size = 4;
+		enum { bucket_size = 4, min_buckets = 8, };
-		static const size_t min_buckets = 8;
 		CLuaHashMapTraits()
 		{}
 

code/nel/include/nel/misc/app_context.h

@@ -88,6 +88,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert) =0;
 		virtual bool getAlreadyCreateSharedAmongThreads() =0;
 		virtual void setAlreadyCreateSharedAmongThreads(bool b) =0;
+		virtual bool isWindowedApplication() = 0;
+		virtual void setWindowedApplication(bool b = true) = 0;
 		//@}
 	protected:
 		/// Called by derived class to finalize initialisation of context
@@ -131,6 +133,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert);
 		virtual bool getAlreadyCreateSharedAmongThreads();
 		virtual void setAlreadyCreateSharedAmongThreads(bool b);
+		virtual bool isWindowedApplication();
+		virtual void setWindowedApplication(bool b);
 
 	private:
 		/// Singleton registry
@@ -147,6 +151,7 @@ namespace NLMISC
 		bool DebugNeedAssert;
 		bool NoAssert;
 		bool AlreadyCreateSharedAmongThreads;
+		bool WindowedApplication;
 	};
 
 	/** This class implements the context interface for the a library module.
@@ -183,6 +188,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert);
 		virtual bool getAlreadyCreateSharedAmongThreads();
 		virtual void setAlreadyCreateSharedAmongThreads(bool b);
+		virtual bool isWindowedApplication();
+		virtual void setWindowedApplication(bool b);
 
 	private:
 		/// Pointer to the application context.

code/nel/include/nel/misc/class_id.h

@@ -61,8 +61,7 @@ public:
 class CClassIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
+	enum { bucket_size = 4, min_buckets = 8, };
-	static const size_t min_buckets = 8;
 	inline size_t operator() ( const CClassId& classId ) const
 	{
 		return ((((uint64)classId >> 32)|0xFFFFFFFF) ^ (((uint64)classId|0xFFFFFFFF) & 0xFFFFFFFF));

code/nel/include/nel/misc/dummy_window.h

@@ -22,6 +22,21 @@
 
 #ifdef NL_OS_WINDOWS // for win32 os only
 
+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
+#	define NOMINMAX
+#endif
 #include <windows.h>
 
 

code/nel/include/nel/misc/entity_id.h

@@ -575,8 +575,7 @@ public:
 // Traits for hash_map using CEntityId
 struct CEntityIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
+	enum { bucket_size = 4, min_buckets = 8, };
-	static const size_t min_buckets = 8;
 	CEntityIdHashMapTraits() { }
 	size_t operator() (const NLMISC::CEntityId &id ) const
 	{

code/nel/include/nel/misc/gtk_displayer.h

@@ -42,11 +42,7 @@ class CGtkDisplayer : public NLMISC::CWindowDisplayer
 {
 public:
 
-	CGtkDisplayer (const char *displayerName = "") : CWindowDisplayer(displayerName)
+	CGtkDisplayer (const char *displayerName = "");
-	{
-		needSlashR = false;
-		createLabel ("@Clear|CLEAR");
-	}
 
 	virtual ~CGtkDisplayer ();
 

code/nel/include/nel/misc/inter_window_msg_queue.h

@@ -27,6 +27,21 @@
 #include "nel/misc/mem_stream.h"
 #include "nel/misc/dummy_window.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
+#	define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace NLMISC

code/nel/include/nel/misc/path.h

@@ -343,7 +343,7 @@ public:
 	/** Adds a search path.
      * The path is a directory "c:/temp" all files in the directory will be included (and recursively if asked)
 	 *
-	 * Alternative directories are not pre-cached (instead of non Alternative files) and will used when a file is not found in the standard directories.
+	 * Alternative directories are not pre-cached (instead of non Alternative files) and will be used when a file is not found in the standard directories.
 	 * For example, local data will be in the cached directories and server repository files will be in the Alternative files. If a new file is not
 	 * found in the local data, we'll try to find it on the repository.
 	 *

code/nel/include/nel/misc/sheet_id.h

@@ -248,8 +248,7 @@ private :
 class CSheetIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
+	enum { bucket_size = 4, min_buckets = 8, };
-	static const size_t min_buckets = 8;
 	inline size_t operator() ( const CSheetId& sheetId ) const
 	{
 		return sheetId.asInt() >> 5;

code/nel/include/nel/misc/sstring.h

@@ -937,21 +937,21 @@ inline CSString operator+(const CSString& s0,const CSString& s1)
 */
 inline CSString operator+(char s0,const CSString& s1)
 {
-	return CSString(s0)+s1;
+	return CSString(s0) + s1.c_str();
 }
 
 inline CSString operator+(const char* s0,const CSString& s1)
 {
-	return CSString(s0)+s1;
+	return CSString(s0) + s1.c_str();
 }
 
-#ifndef NL_COMP_VC10
+#if !defined(NL_COMP_VC) || (NL_COMP_VC_VERSION <= 100)
 // TODO: check if it can be disabled for other compilers too
 inline CSString operator+(const std::string& s0,const CSString& s1)
 {
 	return s0+static_cast<const std::string&>(s1);
 }
-#endif // NL_COMP_VC10
+#endif
 
 } // NLMISC
 

code/nel/include/nel/misc/string_common.h

@@ -264,6 +264,40 @@ inline bool fromString(const std::string &str, bool &val)
 	return true;
 }
 
+inline bool fromString(const char *str, uint32 &val) { if (strstr(str, "-") != NULL) { val = 0; return false; } char *end; unsigned long v; errno = 0; v = strtoul(str, &end, 10); if (errno || v > UINT_MAX || end == str) { val = 0; return false; } else { val = (uint32)v; return true; } }
+inline bool fromString(const char *str, sint32 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > INT_MAX || v < INT_MIN || end == str) { val = 0; return false; } else { val = (sint32)v; return true; } }
+inline bool fromString(const char *str, uint8 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > UCHAR_MAX || v < 0 || end == str) { val = 0; return false; } else { val = (uint8)v; return true; } }
+inline bool fromString(const char *str, sint8 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > SCHAR_MAX || v < SCHAR_MIN || end == str) { val = 0; return false; } else { val = (sint8)v; return true; } }
+inline bool fromString(const char *str, uint16 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > USHRT_MAX || v < 0 || end == str) { val = 0; return false; } else { val = (uint16)v; return true; } }
+inline bool fromString(const char *str, sint16 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > SHRT_MAX || v < SHRT_MIN || end == str) { val = 0; return false; } else { val = (sint16)v; return true; } }
+inline bool fromString(const char *str, uint64 &val) { bool ret = sscanf(str, "%"NL_I64"u", &val) == 1; if (!ret) val = 0; return ret; }
+inline bool fromString(const char *str, sint64 &val) { bool ret = sscanf(str, "%"NL_I64"d", &val) == 1; if (!ret) val = 0; return ret; }
+inline bool fromString(const char *str, float &val) { bool ret = sscanf(str, "%f", &val) == 1; if (!ret) val = 0.0f; return ret; }
+inline bool fromString(const char *str, double &val) { bool ret = sscanf(str, "%lf", &val) == 1; if (!ret) val = 0.0; return ret; }
+
+inline bool fromString(const char *str, bool &val)
+{
+	switch (str[0])
+	{
+	case '1':
+	case 't':
+	case 'y':
+	case 'T':
+	case 'Y':
+		val = true;
+		return true;
+	case '0':
+	case 'f':
+	case 'n':
+	case 'F':
+	case 'N':
+		val = false;
+		return true;
+	}
+
+	return false;
+}
+
 inline bool fromString(const std::string &str, std::string &val) { val = str; return true; }
 
 // stl vectors of bool use bit reference and not real bools, so define the operator for bit reference

code/nel/include/nel/misc/string_mapper.h

@@ -39,8 +39,7 @@ typedef	const std::string *TStringId;
 // Traits for hash_map using CStringId
 struct CStringIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
+	enum { bucket_size = 4, min_buckets = 8, };
-	static const size_t min_buckets = 8;
 	CStringIdHashMapTraits() { }
 	size_t operator() (const NLMISC::TStringId &stringId) const
 	{

code/nel/include/nel/misc/types_nl.h

@@ -53,7 +53,10 @@
 #	endif
 #	ifdef _MSC_VER
 #		define NL_COMP_VC
-#		if _MSC_VER >= 1700
+#		if _MSC_VER >= 1800
+#			define NL_COMP_VC12
+#			define NL_COMP_VC_VERSION 120
+#		elif _MSC_VER >= 1700
 #			define NL_COMP_VC11
 #			define NL_COMP_VC_VERSION 110
 #		elif _MSC_VER >= 1600
@@ -414,6 +417,12 @@ extern void operator delete[](void *p) throw();
 #	define CHashMap stdext::hash_map
 #	define CHashSet stdext::hash_set
 #	define CHashMultiMap stdext::hash_multimap
+#elif defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 120)
+#	include <hash_map>
+#	include <hash_set>
+#	define CHashMap ::std::hash_map
+#	define CHashSet ::std::hash_set
+#	define CHashMultiMap ::std::hash_multimap
 #elif defined(NL_COMP_GCC) // GCC4
 #	include <ext/hash_map>
 #	include <ext/hash_set>
@@ -454,7 +463,11 @@ typedef	uint16	ucchar;
 
 // To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234)
 #ifdef NL_COMP_VC
-#	if (NL_COMP_VC_VERSION >= 80)
+#	if (NL_COMP_VC_VERSION >= 120)
+#		define INT64_CONSTANT(c)		(c##LL)
+#		define SINT64_CONSTANT(c)	(c##LL)
+#		define UINT64_CONSTANT(c)	(c##ULL)
+#	elif (NL_COMP_VC_VERSION >= 80)
 #		define INT64_CONSTANT(c)	(c##LL)
 #		define SINT64_CONSTANT(c)	(c##LL)
 #		define UINT64_CONSTANT(c)	(c##LL)

code/nel/include/nel/misc/ucstring.h

@@ -355,8 +355,7 @@ namespace NLMISC
 // Traits for hash_map using CEntityId
 struct CUCStringHashMapTraits
 {
-	static const size_t bucket_size = 4;
+	enum { bucket_size = 4, min_buckets = 8, };
-	static const size_t min_buckets = 8;
 	CUCStringHashMapTraits() { }
 	size_t operator() (const ucstring &id ) const
 	{

code/nel/include/nel/misc/win_displayer.h

@@ -21,8 +21,19 @@
 
 #ifdef NL_OS_WINDOWS
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+#ifndef WIN32_LEAN_AND_MEAN
-#ifndef NL_COMP_MINGW
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
 #	define NOMINMAX
 #endif
 #include <windows.h>
@@ -46,11 +57,7 @@ class CWinDisplayer : public NLMISC::CWindowDisplayer
 {
 public:
 
-	CWinDisplayer (const char *displayerName = "") : CWindowDisplayer(displayerName), Exit(false)
+	CWinDisplayer(const char *displayerName = "");
-	{
-		needSlashR = true;
-		createLabel ("@Clear|CLEAR");
-	}
 
 	virtual ~CWinDisplayer ();
 

code/nel/include/nel/misc/xml_auto_ptr.h

@@ -31,7 +31,7 @@ public:
 	~CXMLAutoPtr() { destroy(); }
 	operator const char *() const { return _Value; }
 	operator bool() const { return _Value != NULL; }
-	operator std::string() const { return std::string(_Value); }
+	inline std::string str() const { return _Value; }
 	bool operator ! () const { return _Value == NULL; }
 	operator const unsigned char *() const { return (const unsigned char *)  _Value; }
 	char operator * ()  const { nlassert(_Value); return *_Value; }

code/nel/include/nel/net/service.h

@@ -218,13 +218,13 @@ public:
 	static bool						isServiceInitialized() { return _Instance != NULL; }
 
 	/// Returns the current service short name (ie: TS)
-	const std::string				&getServiceShortName () const { return _ShortName; };
+	const std::string				&getServiceShortName () const { return _ShortName; }
 
 	/// Returns the current service long name (ie: test_serivce)
-	const std::string				&getServiceLongName () const { return _LongName; };
+	const std::string				&getServiceLongName () const { return _LongName; }
 
 	/// Returns the current service alias name setted by AES
-	const std::string				&getServiceAliasName () const { return _AliasName; };
+	const std::string				&getServiceAliasName () const { return _AliasName; }
 
 	/// Returns the current service unified name that is   alias/short-id or short-id if alias is empty
 	std::string						getServiceUnifiedName () const;
@@ -242,10 +242,10 @@ public:
 	uint32							getLaunchingDate () const;
 
 	/// Return true if this service don't use the NS (naming service)
-	bool							getDontUseNS() const { return _DontUseNS; };
+	bool							getDontUseNS() const { return _DontUseNS; }
 
 	/// Return true if this service don't use the AES (admin executor service)
-	bool							getDontUseAES() const { return _DontUseAES; };
+	bool							getDontUseAES() const { return _DontUseAES; }
 
 	/// Returns arguments of the program pass from the user to the program using parameters (ie: "myprog param1 param2")
 	const NLMISC::CVectorSString	&getArgs () const { return _Args; }

code/nel/include/nel/sound/containers.h

@@ -42,8 +42,7 @@ namespace NLSOUND {
 template <class Pointer>
 struct THashPtr : public std::unary_function<const Pointer &, size_t>
 {
-	static const size_t bucket_size = 4;
+	enum { bucket_size = 4, min_buckets = 8, };
-	static const size_t min_buckets = 8;
 	size_t operator () (const Pointer &ptr) const
 	{
 		//CHashSet<uint>::hasher	h;

code/nel/include/nel/sound/context_sound.h

@@ -82,8 +82,7 @@ struct CContextMatcher
 
 	struct CHash : public std::unary_function<CContextMatcher, size_t>
 	{
-		static const size_t bucket_size = 4;
+		enum { bucket_size = 4, min_buckets = 8, };
-		static const size_t min_buckets = 8;
 		size_t operator () (const CContextMatcher &patternMatcher) const
 		{
 			return patternMatcher.getHashValue();

code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h

@@ -543,14 +543,14 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog,
     setMouseTracking(true);
     cols = width;
 
-    if (withColorDialog)
+	if (withColorDialog)
 	{
 		moreButton = new ColorPickerButton(this);
 		moreButton->setFixedWidth(24);
 		moreButton->setFixedHeight(21);
 		moreButton->setFrameRect(QRect(2, 2, 20, 17));
 		connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
-    }
+	}
 	else
 	{
 		moreButton = 0;

code/nel/samples/net/udp/bench_service.cpp

@@ -98,8 +98,7 @@ struct CClient
 
 struct TInetAddressHash
 {
-	static const size_t bucket_size = 4;
+	enum { bucket_size = 4, min_buckets = 8, };
-	static const size_t min_buckets = 8;
 
 	inline bool operator() (const NLNET::CInetAddress &x1, const NLNET::CInetAddress &x2) const
 	{

code/nel/src/3d/driver/direct3d/driver_direct3d.cpp

@@ -1509,9 +1509,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
 		}
 	}
 
-	
-//	_D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface);
-
 	// Check some caps
 	D3DCAPS9 caps;
 	if (_DeviceInterface->GetDeviceCaps(&caps) == D3D_OK)

code/nel/src/3d/driver/opengl/driver_opengl.cpp

@@ -435,11 +435,7 @@ bool CDriverGL::setupDisplay()
 	glViewport(0,0,_CurrentMode.Width,_CurrentMode.Height);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-#ifdef USE_OPENGLES
-	glOrthof(0.f,_CurrentMode.Width,_CurrentMode.Height,0.f,-1.0f,1.0f);
-#else
 	glOrtho(0,_CurrentMode.Width,_CurrentMode.Height,0,-1.0f,1.0f);
-#endif
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 #ifndef USE_OPENGLES
@@ -725,11 +721,7 @@ bool CDriverGL::activeFrameBufferObject(ITexture * tex)
 		}
 		else
 		{
-#ifdef USE_OPENGLES
-			nglBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-#else
 			nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-#endif
 			return true;
 		}
 	}
@@ -2178,7 +2170,7 @@ void CDriverGL::flush()
 // ***************************************************************************
 void	CDriverGL::setSwapVBLInterval(uint interval)
 {
-	H_AUTO_OGL(CDriverGL_setSwapVBLInterval)
+	H_AUTO_OGL(CDriverGL_setSwapVBLInterval);
 
 	if (!_Initialized)
 		return;

code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h

@@ -40,6 +40,24 @@ extern "C" {
 #define GL_ADD_SIGNED_EXT GL_ADD_SIGNED
 #define GL_INTERPOLATE_EXT GL_INTERPOLATE
 #define GL_BUMP_ENVMAP_ATI GL_INTERPOLATE
+#define GL_FRAMEBUFFER_EXT GL_FRAMEBUFFER_OES
+#define GL_RENDERBUFFER_EXT GL_RENDERBUFFER_OES
+#define GL_DEPTH24_STENCIL8_EXT GL_DEPTH24_STENCIL8_OES
+#define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
+#define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0_OES
+#define GL_DEPTH_ATTACHMENT_EXT GL_DEPTH_ATTACHMENT_OES
+#define GL_STENCIL_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT_OES
+#define GL_ARRAY_BUFFER_ARB GL_ARRAY_BUFFER
+#define GL_TEXTURE0_ARB GL_TEXTURE0
+
+#define GL_ALPHA8 GL_ALPHA
+#define GL_LUMINANCE8_ALPHA8 GL_LUMINANCE_ALPHA
+#define GL_LUMINANCE8 GL_LUMINANCE
+#define GL_RGBA8 GL_RGBA
+#define GL_RGB8 GL_RGB
+
+#define GL_STATIC_DRAW_ARB GL_STATIC_DRAW
+#define GL_DYNAMIC_DRAW_ARB GL_DYNAMIC_DRAW
 
 #define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES
 #define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES
@@ -48,6 +66,31 @@ extern "C" {
 #define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES
 #define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES
 
+#define nglGenRenderbuffersEXT nglGenRenderbuffersOES
+#define nglBindRenderbufferEXT nglBindRenderbufferOES
+#define nglDeleteRenderbuffersEXT nglDeleteRenderbuffersOES
+#define nglRenderbufferStorageEXT nglRenderbufferStorageOES
+#define nglGenFramebuffersEXT nglGenFramebuffersOES
+#define nglBindFramebufferEXT nglBindFramebufferOES
+#define nglFramebufferTexture2DEXT nglFramebufferTexture2DOES
+#define nglFramebufferRenderbufferEXT nglFramebufferRenderbufferOES
+#define nglCheckFramebufferStatusEXT nglCheckFramebufferStatusOES
+#define nglDeleteBuffersARB glDeleteBuffers
+#define nglIsBufferARB glIsBuffer
+#define nglDeleteRenderbuffersEXT nglDeleteRenderbuffersOES
+#define nglBindFramebufferEXT nglBindFramebufferOES
+#define nglDeleteFramebuffersEXT nglDeleteFramebuffersOES
+#define nglUnmapBufferARB nglUnmapBufferOES
+#define nglActiveTextureARB glActiveTexture
+#define nglClientActiveTextureARB glClientActiveTexture
+#define nglBindBufferARB glBindBuffer
+#define nglGenBuffersARB glGenBuffers
+#define nglBufferDataARB glBufferData
+
+#define glFrustum glFrustumf
+#define glOrtho glOrthof
+#define glDepthRange glDepthRangef
+
 #else
 
 #if defined(NL_OS_MAC)

code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp

@@ -37,19 +37,11 @@ void CDriverGL::setFrustum(float left, float right, float bottom, float top, flo
 
 	if (perspective)
 	{
-#ifdef USE_OPENGLES
-		glFrustumf(left,right,bottom,top,znear,zfar);
-#else
 		glFrustum(left,right,bottom,top,znear,zfar);
-#endif
 	}
 	else
 	{
-#ifdef USE_OPENGLES
-		glOrthof(left,right,bottom,top,znear,zfar);
-#else
 		glOrtho(left,right,bottom,top,znear,zfar);
-#endif
 	}
 
 	_ProjMatDirty = true;

code/nel/src/3d/driver/opengl/driver_opengl_states.cpp

@@ -155,11 +155,7 @@ void			CDriverGLStates::forceDefaults(uint nbStages)
 	for(stage=0;stage<nbStages; stage++)
 	{
 		// disable texturing.
-#ifdef USE_OPENGLES
-		glActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 
 		glDisable(GL_TEXTURE_2D);
 
@@ -188,13 +184,8 @@ void			CDriverGLStates::forceDefaults(uint nbStages)
 	}
 
 	// ActiveTexture current texture to 0.
-#ifdef USE_OPENGLES
-	glActiveTexture(GL_TEXTURE0);
-	glClientActiveTexture(GL_TEXTURE0);
-#else
 	nglActiveTextureARB(GL_TEXTURE0_ARB);
 	nglClientActiveTextureARB(GL_TEXTURE0_ARB);
-#endif
 
 	_CurrentActiveTextureARB= 0;
 	_CurrentClientActiveTextureARB= 0;
@@ -622,11 +613,7 @@ void CDriverGLStates::updateDepthRange()
 
 	float delta = _ZBias * (_DepthRangeFar - _DepthRangeNear);
 
-#ifdef USE_OPENGLES
-	glDepthRangef(delta + _DepthRangeNear, delta + _DepthRangeFar);
-#else
 	glDepthRange(delta + _DepthRangeNear, delta + _DepthRangeFar);
-#endif
 }
 
 // ***************************************************************************
@@ -767,7 +754,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 		{
 			glDisable(GL_TEXTURE_2D);
 		}
-		else if(oldTexMode == TextureRect)
+		else if (oldTexMode == TextureRect)
 		{
 #ifndef USE_OPENGLES
 			if(_TextureRectangleSupported)
@@ -780,7 +767,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 				glDisable(GL_TEXTURE_2D);
 			}
 		}
-		else if(oldTexMode == TextureCubeMap)
+		else if (oldTexMode == TextureCubeMap)
 		{
 			if(_TextureCubeMapSupported)
 			{
@@ -835,11 +822,7 @@ void			CDriverGLStates::activeTextureARB(uint stage)
 
 	if( _CurrentActiveTextureARB != stage )
 	{
-#ifdef USE_OPENGLES
-		glActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 
 		_CurrentActiveTextureARB= stage;
 	}
@@ -850,11 +833,7 @@ void			CDriverGLStates::forceActiveTextureARB(uint stage)
 {
 	H_AUTO_OGL(CDriverGLStates_forceActiveTextureARB);
 
-#ifdef USE_OPENGLES
-	glActiveTexture(GL_TEXTURE0+stage);
-#else
 	nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 
 	_CurrentActiveTextureARB= stage;
 }
@@ -958,11 +937,7 @@ void			CDriverGLStates::clientActiveTextureARB(uint stage)
 
 	if( _CurrentClientActiveTextureARB != stage )
 	{
-#ifdef USE_OPENGLES
-		glClientActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglClientActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 		_CurrentClientActiveTextureARB= stage;
 	}
 }
@@ -1121,11 +1096,7 @@ void CDriverGLStates::forceBindARBVertexBuffer(uint objectID)
 {
 	H_AUTO_OGL(CDriverGLStates_forceBindARBVertexBuffer)
 
-#ifdef USE_OPENGLES
-	glBindBuffer(GL_ARRAY_BUFFER, objectID);
-#else
 	nglBindBufferARB(GL_ARRAY_BUFFER_ARB, objectID);
-#endif
 
 	_CurrARBVertexBuffer = objectID;
 }

code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp

@@ -93,19 +93,6 @@ CTextureDrvInfosGL::~CTextureDrvInfosGL()
 	{
 		_Driver->_TextureUsed[TextureUsedIdx] = NULL;
 	}
-
-#ifdef USE_OPENGLES
-	if (InitFBO)
-	{
-		nglDeleteFramebuffersOES(1, &FBOId);
-		if(AttachDepthStencil)
-		{
-			nglDeleteRenderbuffersOES(1, &DepthFBOId);
-			if(!UsePackedDepthStencil)
-				nglDeleteRenderbuffersOES(1, &StencilFBOId);
-		}
-	}
-#endif
 }
 
 CDepthStencilFBO::CDepthStencilFBO(CDriverGL *driver, uint width, uint height)
@@ -175,53 +162,6 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 			AttachDepthStencil = !((CTextureBloom*)tex)->isMode2D();
 		}
 
-#ifdef USE_OPENGLES
-		// generate IDs
-		nglGenFramebuffersOES(1, &FBOId);
-		if(AttachDepthStencil)
-		{
-			nglGenRenderbuffersOES(1, &DepthFBOId);
-			if(UsePackedDepthStencil)
-				StencilFBOId = DepthFBOId;
-			else
-				nglGenRenderbuffersOES(1, &StencilFBOId);
-		}
-
-		//nldebug("3D: using depth %d and stencil %d", DepthFBOId, StencilFBOId);
-
-		// initialize FBO
-		nglBindFramebufferOES(GL_FRAMEBUFFER_OES, FBOId);
-		nglFramebufferTexture2DOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, TextureMode, ID, 0);
-
-		// attach depth/stencil render to FBO
-		// note: for some still unkown reason it's impossible to add
-		// a stencil buffer as shown in the respective docs (see
-		// opengl.org extension registry). Until a safe approach to add
-		// them is found, there will be no attached stencil for the time
-		// being, aside of using packed depth+stencil buffers.
-		if(AttachDepthStencil)
-		{
-			if(UsePackedDepthStencil)
-			{
-				//nldebug("3D: using packed depth stencil");
-				nglBindRenderbufferOES(GL_RENDERBUFFER_OES, StencilFBOId);
-				nglRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH24_STENCIL8_OES, tex->getWidth(), tex->getHeight());
-			}
-			else
-			{
-				nglBindRenderbufferOES(GL_RENDERBUFFER_OES, DepthFBOId);
-				nglRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH_COMPONENT24_OES, tex->getWidth(), tex->getHeight());
-				/*
-				nglBindRenderbufferEXT(GL_RENDERBUFFER_OES, StencilFBOId);
-				nglRenderbufferStorageEXT(GL_RENDERBUFFER_OES, GL_STENCIL_INDEX8_EXT, tex->getWidth(), tex->getHeight());
-				*/
-			}
-			nglFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, DepthFBOId);
-			nldebug("3D: glFramebufferRenderbufferExt(depth:24) = %X", nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-			nglFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_STENCIL_ATTACHMENT_OES, GL_RENDERBUFFER_OES, StencilFBOId);
-			nldebug("3D: glFramebufferRenderbufferExt(stencil:8) = %X", nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-		}
-#else
 		// generate IDs
 		nglGenFramebuffersEXT(1, &FBOId);
 
@@ -253,15 +193,10 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 										 GL_RENDERBUFFER_EXT, DepthStencilFBO->StencilFBOId);
 			nldebug("3D: glFramebufferRenderbufferExt(stencil:8) = %X", nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
 		}
-#endif
 
 		// check status
-		GLenum status;
+		GLenum status = (GLenum) nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-#ifdef USE_OPENGLES
+
-		status = (GLenum) nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES);
-#else
-		status = (GLenum) nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-#endif
 		switch(status) {
 #ifdef GL_FRAMEBUFFER_COMPLETE_EXT
 			case GL_FRAMEBUFFER_COMPLETE_EXT:
@@ -361,11 +296,8 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 		// clean up resources if allocation failed
 		if (!InitFBO)
 		{
-#ifdef USE_OPENGLES
-			nglDeleteFramebuffersOES(1, &FBOId);
-#else
 			nglDeleteFramebuffersEXT(1, &FBOId);
-#endif
+
 			if (AttachDepthStencil)
 			{
 				DepthStencilFBO = NULL;
@@ -385,22 +317,14 @@ bool CTextureDrvInfosGL::activeFrameBufferObject(ITexture * tex)
 		if(initFrameBufferObject(tex))
 		{
 			glBindTexture(TextureMode, 0);
-#ifdef USE_OPENGLES
-			nglBindFramebufferOES(GL_FRAMEBUFFER_OES, FBOId);
-#else
 			nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, FBOId);
-#endif
 		}
 		else
 			return false;
 	}
 	else
 	{
-#ifdef USE_OPENGLES
-		nglBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-#else
 		nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-#endif
 	}
 
 	return true;
@@ -508,11 +432,7 @@ GLint	CDriverGL::getGlTextureFormat(ITexture& tex, bool &compressed)
 		break;
 	}
 
-#ifdef USE_OPENGLES
-	return GL_RGBA;
-#else
 	return GL_RGBA8;
-#endif
 }
 
 // ***************************************************************************
@@ -521,11 +441,7 @@ static GLint	getGlSrcTextureFormat(ITexture &tex, GLint glfmt)
 	H_AUTO_OGL(getGlSrcTextureFormat)
 
 	// Is destination format is alpha or lumiance ?
-#ifdef USE_OPENGLES
-	if ((glfmt==GL_ALPHA)||(glfmt==GL_LUMINANCE_ALPHA)||(glfmt==GL_LUMINANCE))
-#else
 	if ((glfmt==GL_ALPHA8)||(glfmt==GL_LUMINANCE8_ALPHA8)||(glfmt==GL_LUMINANCE8))
-#endif
 	{
 		switch(tex.getPixelFormat())
 		{
@@ -578,19 +494,9 @@ uint				CDriverGL::computeMipMapMemoryUsage(uint w, uint h, GLint glfmt) const
 	H_AUTO_OGL(CDriverGL_computeMipMapMemoryUsage)
 	switch(glfmt)
 	{
-#ifdef GL_RGBA8
 	case GL_RGBA8:		return w*h* 4;
-#endif
-#ifdef GL_RGBA
-	case GL_RGBA:		return w*h* 4;
-#endif
 	// Well this is ugly, but simple :). GeForce 888 is stored as 32 bits.
-#ifdef GL_RGB8
 	case GL_RGB8:		return w*h* 4;
-#endif
-#ifdef GL_RGB
-	case GL_RGB:		return w*h* 4;
-#endif
 #ifdef GL_RGBA4
 	case GL_RGBA4:		return w*h* 2;
 #endif
@@ -600,24 +506,9 @@ uint				CDriverGL::computeMipMapMemoryUsage(uint w, uint h, GLint glfmt) const
 #ifdef GL_RGB5
 	case GL_RGB5:		return w*h* 2;
 #endif
-#ifdef GL_LUMINANCE8
 	case GL_LUMINANCE8:	return w*h* 1;
-#endif
-#ifdef GL_LUMINANCE
-	case GL_LUMINANCE:	return w*h* 1;
-#endif
-#ifdef GL_ALPHA8
 	case GL_ALPHA8:		return w*h* 1;
-#endif
-#ifdef GL_ALPHA
-	case GL_ALPHA:		return w*h* 1;
-#endif
-#ifdef GL_LUMINANCE8_ALPHA8
 	case GL_LUMINANCE8_ALPHA8:	return w*h* 2;
-#endif
-#ifdef GL_LUMINANCE_ALPHA
-	case GL_LUMINANCE_ALPHA:	return w*h* 2;
-#endif
 #ifdef GL_COMPRESSED_RGB_S3TC_DXT1_EXT
 	case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:	return w*h /2;
 #endif

code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp

@@ -1216,11 +1216,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	GLuint vertexBufferID;
 	glGetError();
 
-#ifdef USE_OPENGLES
-	glGenBuffers(1, &vertexBufferID);
-#else
 	nglGenBuffersARB(1, &vertexBufferID);
-#endif
 
 	if (glGetError() != GL_NO_ERROR) return NULL;
 	_Driver->_DriverGLStates.forceBindARBVertexBuffer(vertexBufferID);
@@ -1229,7 +1225,8 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	{
 		case CVertexBuffer::AGPVolatile:
 #ifdef USE_OPENGLES
-			glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STREAM_DRAW);
+			// TODO: GL_STREAM_DRAW doesn't exist in OpenGL ES 1.x
+			glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
 #else
 			nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STREAM_DRAW_ARB);
 #endif
@@ -1259,11 +1256,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	}
 	if (glGetError() != GL_NO_ERROR)
 	{
-#ifdef USE_OPENGLES
-		glDeleteBuffers(1, &vertexBufferID);
-#else
 		nglDeleteBuffersARB(1, &vertexBufferID);
-#endif
 
 		return NULL;
 	}
@@ -1306,13 +1299,10 @@ void CVertexArrayRangeARB::updateLostBuffers()
 		{
 			nlassert((*it)->_VertexObjectId);
 			GLuint id = (GLuint) (*it)->_VertexObjectId;
-#ifdef USE_OPENGLES
+
-			nlassert(glIsBuffer(id));
-			glDeleteBuffers(1, &id);
-#else
 			nlassert(nglIsBufferARB(id));
 			nglDeleteBuffersARB(1, &id);
-#endif
+
 			(*it)->_VertexObjectId = 0;
 			(*it)->VB->setLocation(CVertexBuffer::NotResident);
 		}
@@ -1361,13 +1351,8 @@ CVertexBufferHardARB::~CVertexBufferHardARB()
 	if (_VertexObjectId)
 	{
 		GLuint id = (GLuint) _VertexObjectId;
-#ifdef USE_OPENGLES
-		nlassert(glIsBuffer(id));
-		glDeleteBuffers(1, &id);
-#else
 		nlassert(nglIsBufferARB(id));
 		nglDeleteBuffersARB(1, &id);
-#endif
 	}
 	if (_VertexArrayRange)
 	{
@@ -1412,12 +1397,7 @@ void *CVertexBufferHardARB::lock()
 		}
 		// recreate a vb
 		GLuint vertexBufferID;
-
-#ifdef USE_OPENGLES
-		glGenBuffers(1, &vertexBufferID);
-#else
 		nglGenBuffersARB(1, &vertexBufferID);
-#endif
 
 		if (glGetError() != GL_NO_ERROR)
 		{
@@ -1429,42 +1409,30 @@ void *CVertexBufferHardARB::lock()
 		{
 			case CVertexBuffer::AGPVolatile:
 #ifdef USE_OPENGLES
-				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STREAM_DRAW);
+				// TODO: GL_STREAM_DRAW doesn't exist in OpenGL ES 1.x
+				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
 #else
 				nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STREAM_DRAW_ARB);
 #endif
 			break;
 			case CVertexBuffer::StaticPreferred:
 				if (_Driver->getStaticMemoryToVRAM())
-#ifdef USE_OPENGLES
-					glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STATIC_DRAW);
-#else
 					nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STATIC_DRAW_ARB);
-#endif
 				else
-#ifdef USE_OPENGLES
-					glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
-#else
 					nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
-#endif
 			break;
 			// case CVertexBuffer::AGPPreferred:
 			default:
-#ifdef USE_OPENGLES
-				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
-#else
 				nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
-#endif
+
 			break;
 		}
 		if (glGetError() != GL_NO_ERROR)
 		{
 			_Driver->incrementResetCounter();
-#ifdef USE_OPENGLES
+
-			glDeleteBuffers(1, &vertexBufferID);
-#else
 			nglDeleteBuffersARB(1, &vertexBufferID);
-#endif
+
 			return &_DummyVB[0];;
 		}
 		_VertexObjectId = vertexBufferID;
@@ -1567,12 +1535,10 @@ void CVertexBufferHardARB::unlock()
 
 #ifdef USE_OPENGLES
 	if (_Driver->_Extensions.OESMapBuffer)
-	{
-		unmapOk = nglUnmapBufferOES(GL_ARRAY_BUFFER);
-	}
-#else
-	unmapOk = nglUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
 #endif
+	{
+		unmapOk = nglUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
+	}
 
 	#ifdef NL_DEBUG
 		_Unmapping = false;

code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp

@@ -453,7 +453,6 @@ bool CDriverGL::setupEXTVertexShader(const CVPParser::TProgram &program, GLuint
 	// clear last error
 	GLenum glError = glGetError();
 
-	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
 	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
 
 	// allocate the symbols

code/nel/src/3d/driver/opengl/driver_opengl_window.cpp

@@ -627,10 +627,15 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 	// Offscreen mode ?
 	if (_CurrentMode.OffScreen)
 	{
-#if 0
+		if (!createWindow(mode)) return false;
-		if (!createWindow(mode))
-			return false;
 
+		HWND tmpHWND = _win;
+		int width = mode.Width;
+		int height = mode.Height;
+
+#ifdef USE_OPENGLES
+		// TODO: implement for OpenGL ES 1.x
+#else
 		// resize the window
 		RECT rc;
 		SetRect (&rc, 0, 0, width, height);
@@ -1437,8 +1442,17 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 #ifdef NL_OS_WINDOWS
 
 	// create the OpenGL window
-	window = CreateWindowW(L"NLClass", L"NeL Window", WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|WS_CLIPSIBLINGS,
+	DWORD dwStyle = WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|WS_CLIPSIBLINGS;
-		CW_USEDEFAULT, CW_USEDEFAULT, mode.Width, mode.Height, HWND_DESKTOP, NULL, GetModuleHandle(NULL), NULL);
+	int pos = CW_USEDEFAULT;
+	HWND hwndParent = HWND_DESKTOP;
+	if (mode.OffScreen)
+	{
+		dwStyle &= ~WS_VISIBLE;
+		pos = 0;
+		hwndParent = NULL;
+	}
+	window = CreateWindowW(L"NLClass", L"NeL Window", dwStyle, 
+		pos, pos, mode.Width, mode.Height, hwndParent, NULL, GetModuleHandle(NULL), NULL);
 
 	if (window == EmptyWindow)
 	{
@@ -1469,7 +1483,7 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 		[[CocoaApplicationDelegate alloc] initWithDriver:this];
 
 	// set the application delegate, this will handle window/app close events
-	[NSApp setDelegate:appDelegate];
+	[NSApp setDelegate:(id<NSFileManagerDelegate>)appDelegate];
 
 	// bind the close button of the window to applicationShouldTerminate
 	id closeButton = [cocoa_window standardWindowButton:NSWindowCloseButton];

code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp

@@ -270,28 +270,14 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 		return false;
 	}
 
-	// first event about mouse movement after setting to emulateRawMode
-	if(_setToEmulateRawMode &&
-		(event.type == NSMouseMoved || 
-		event.type == NSLeftMouseDragged || 
-		event.type == NSRightMouseDragged))
-	{
-		// do not report because it reflects wrapping pointer to 0.5/0.5 
-		_setToEmulateRawMode = false;
-		return false;
-	}
-
 	// convert the modifiers for nel to pass them with the events
-	NLMISC::TKeyButton modifiers =
+	NLMISC::TKeyButton modifiers = modifierFlagsToNelKeyButton([event modifierFlags]);
-		modifierFlagsToNelKeyButton([event modifierFlags]);
 
 	switch(event.type)
 	{
 	case NSLeftMouseDown:
 	{
-		server->postEvent(new NLMISC::CEventMouseDown(
+		server->postEvent(new NLMISC::CEventMouseDown(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
-			mousePos.x, mousePos.y,
-			(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
 	}
 	break;
 	case NSLeftMouseUp:
@@ -319,15 +305,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;
 
-		// when emulating raw mode, send the delta in a CGDMouseMove event
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers, this);
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(
-				mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers, this);
 
 		server->postEvent(nelEvent);
 		break;
@@ -336,15 +314,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;
 
-		// when emulating raw mode, send the delta in a CGDMouseMove event
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this);
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
-				(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this);
 
 		server->postEvent(nelEvent);
 		break;
@@ -353,15 +323,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;
 
-		// when emulating raw mode, send the delta in a CGDMouseMove event
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this);
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
-				(NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this);
 
 		server->postEvent(nelEvent);
 		break;
@@ -434,12 +396,6 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	}
 	}
 
-	if(_emulateRawMode && _driver && (event.type == NSMouseMoved || 
-		event.type == NSLeftMouseDragged || event.type == NSRightMouseDragged)) 
-	{
-		_driver->setMousePos(0.5, 0.5);
-	}
-
 	return true;
 }
 
@@ -492,17 +448,4 @@ void CCocoaEventEmitter::submitEvents(CEventServer& server, bool /* allWins */)
 	_server = &server;
 }
 
-void CCocoaEventEmitter::emulateMouseRawMode(bool enable)
-{
-	_emulateRawMode = enable;
-	
-	if(_emulateRawMode)
-	{
-		_setToEmulateRawMode = true;
-		
-		if(_driver)
-			_driver->setMousePos(0.5, 0.5);
-	}
-}
-
 }

code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h

@@ -31,8 +31,6 @@ namespace NLMISC
 
 class CCocoaEventEmitter : public IEventEmitter
 {
-	bool             _emulateRawMode;
-	bool             _setToEmulateRawMode;
 	bool             _eventLoop;
 	NL3D::IDriver*   _driver;
 	CocoaOpenGLView* _glView;
@@ -42,8 +40,6 @@ class CCocoaEventEmitter : public IEventEmitter
 
 public:
 	CCocoaEventEmitter() :
-		_emulateRawMode(false),
-		_setToEmulateRawMode(false),
 		_driver(NULL),
 		_glView(nil),
 		_server(NULL) { }

code/nel/src/3d/driver/opengl/unix_event_emitter.h

@@ -100,7 +100,6 @@ private:
 	std::map<TKey, bool>	_PressedKeys;
 	XIM						_im;
 	XIC						_ic;
-	bool					_emulateRawMode;
 	NL3D::IDriver*			_driver;
 	CUnixEventServer		_InternalServer;
 	ucstring				_CopiedString;

code/nel/src/3d/landscape.cpp

@@ -583,7 +583,6 @@ void			CLandscape::setDriver(IDriver *drv)
 		// Does the driver has sufficient requirements for Vegetable???
 		// only if VP supported by GPU, and Only if max vertices allowed.
 		_DriverOkForVegetable = _VertexShaderOk && (_Driver->getMaxVerticesByVertexBufferHard()>=(uint)NL3D_LANDSCAPE_VEGETABLE_MAX_AGP_VERTEX_MAX);
-
 	}
 }
 

code/nel/src/3d/landscapevb_allocator.cpp

@@ -611,7 +611,6 @@ void			CLandscapeVBAllocator::setupVBFormatAndVertexProgram(bool withVertexProgr
 			nlverify(_Driver->compileVertexProgram(_VertexProgram[1]));
 		}
 	}
-
 }
 
 

code/nel/src/3d/meshvp_wind_tree.cpp

@@ -392,7 +392,6 @@ bool	CMeshVPWindTree::begin(IDriver *driver, CScene *scene, CMeshBaseInstance *m
 	sint	numPls= renderTrav->getNumVPLights()-1;
 	clamp(numPls, 0, CRenderTrav::MaxVPLight-1);
 
-
 	// Enable normalize only if requested by user. Because lighting don't manage correct "scale lighting"
 	uint	idVP= (SpecularLighting?2:0) + (driver->isForceNormalize()?1:0) ;
 	// correct VP id for correct unmber of pls.
@@ -523,7 +522,7 @@ void	CMeshVPWindTree::beginMBRInstance(IDriver *driver, CScene *scene, CMeshBase
 	idVP = numPls*4 + idVP;
 
 	// re-activate VP if idVP different from last setup
-	if(idVP != _LastMBRIdVP)
+	if (idVP != _LastMBRIdVP)
 	{
 		_LastMBRIdVP= idVP;
 		driver->activeVertexProgram(_VertexProgram[_LastMBRIdVP]);

code/nel/src/3d/scene.cpp

@@ -158,7 +158,7 @@ CScene::CScene(bool bSmallScene) : LightTrav(bSmallScene)
 
 	_MaxSkeletonsInNotCLodForm= 20;
 
-	_FilterRenderFlags= std::numeric_limits<uint32>::max();
+	_FilterRenderFlags = std::numeric_limits<uint32>::max();
 
 	_NextRenderProfile= false;
 
@@ -592,11 +592,9 @@ void	CScene::renderPart(UScene::TRenderPart rp, bool	doHrcPass, bool doTrav, boo
 		//
 		nlassert(CurrentCamera);
 
-
 		// update models.
 		updateModels();
 
-
 		// Use the camera to setup Clip / Render pass.
 		float left, right, bottom, top, znear, zfar;
 		CurrentCamera->getFrustum(left, right, bottom, top, znear, zfar);

code/nel/src/3d/transform.cpp

@@ -113,7 +113,7 @@ CTransform::CTransform()
 	_StateFlags= IsOpaque | IsUserLightable;
 
 	// By default, always allow rendering of Transform Models.
-	_RenderFilterType= std::numeric_limits<uint32>::max();
+	_RenderFilterType = std::numeric_limits<uint32>::max();
 
 	// By default, don't suport fast intersection detection
 	_SupportFastIntersect= false;

code/nel/src/3d/water_pool_manager.cpp

@@ -44,19 +44,19 @@ NLMISC_COMMAND(setWaterPool, "Setup a pool of water in the water pool manager",
 	}
 	if (numArgs == 3)
 	{
-		whmb.FilterWeight = ::atof(args[2].c_str());
+		NLMISC::fromString(args[2], whmb.FilterWeight);
 	}
 	if (numArgs == 4)
 	{
-		whmb.UnitSize = ::atof(args[3].c_str());
+		NLMISC::fromString(args[3], whmb.UnitSize);
 	}
 	if (numArgs == 5)
 	{
-		whmb.WaveIntensity = ::atof(args[4].c_str());
+		NLMISC::fromString(args[4], whmb.WaveIntensity);
 	}
 	if (numArgs == 4)
 	{
-		whmb.WavePeriod = ::atof(args[5].c_str());
+		NLMISC::fromString(args[5], whmb.WavePeriod);
 	}
 	// create the water pool
 	GetWaterPoolManager().createWaterPool(whmb);

code/nel/src/3d/zone_search.cpp

@@ -73,7 +73,7 @@ pair<string, uint32> CZoneSearch::getZoneName(uint x, uint y, uint cx, uint cy)
 
 	sprintf(name, "%d_%c%c.zonel", zoneY, firstLetter, secondLetter);
 
-	return make_pair<string, uint32>(string(name), distance);
+	return std::pair<string, uint32>(string(name), distance);
 }
 
 

code/nel/src/georges/form_dfn.cpp

@@ -707,7 +707,7 @@ bool CFormDfn::getEntryIndexByName (uint &entry, const	std::string &name) const
 		}
 		entryIndex++;
 	}
-	entry=std::numeric_limits<uint>::max();
+	entry = std::numeric_limits<uint>::max();
 	return	false;
 }
 

code/nel/src/gui/CMakeLists.txt

@@ -6,7 +6,7 @@ SOURCE_GROUP("src" FILES ${SRC})
 
 NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 
-INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
 
 TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBWWW_LIBRARIES} ${CURL_LIBRARIES})
 SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")

code/nel/src/gui/ctrl_base_button.cpp

@@ -701,6 +701,11 @@ namespace NLGUI
 					//pIM->submitEvent ("button_click:"+getId());
 				}
 				*/
+
+				// top-right corner is EventX=0, EventY=0
+				_EventX = eventDesc.getX() - _XReal;
+				_EventY = (_YReal + _HReal) - eventDesc.getY();
+
 				runLeftClickAction();
 				if (CWidgetManager::getInstance()->getCapturePointerLeft() == NULL) return true; // event handler may release cpature from this object (if it is removed for example)
 

code/nel/src/gui/ctrl_scroll.cpp

@@ -519,17 +519,17 @@ namespace NLGUI
 
 		// Read Action handlers
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscroll" );
-		if (prop)	_AHOnScroll = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScroll = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"params" );
 		if (prop)	_AHOnScrollParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollend" );
-		if (prop)	_AHOnScrollEnd = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScrollEnd = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"end_params" );
 		if (prop)	_AHOnScrollEndParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollcancel" );
-		if (prop)	_AHOnScrollCancel = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScrollCancel = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"cancel_params" );
 		if (prop)	_AHOnScrollCancelParams = string((const char*)prop);
 
@@ -538,9 +538,9 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( node, (xmlChar*)"target" );
 		if (prop)
 		{
-			CInterfaceGroup	*group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(prop));
+			CInterfaceGroup	*group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(prop.str()));
 			if(group == NULL)
-				group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(this->getId(), prop));
+				group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(this->getId(), prop.str()));
 
 			if(group != NULL)
 				setTarget (group);

code/nel/src/gui/dbgroup_combo_box.cpp

@@ -268,7 +268,7 @@ namespace NLGUI
 	void	CDBGroupComboBox::addText(const ucstring &text)
 	{
 		dirt();
-		_Texts.push_back(make_pair(_Texts.size(), text));
+		_Texts.push_back(make_pair((uint)_Texts.size(), text));
 		_Textures.push_back(std::string());
 	}
 
@@ -330,7 +330,7 @@ namespace NLGUI
 	}
 
 	// ***************************************************************************
-	const uint		&CDBGroupComboBox::getTextId(uint i) const
+	uint CDBGroupComboBox::getTextId(uint i) const
 	{
 		static	uint	null = 0;
 		if(i<_Texts.size())

code/nel/src/gui/group_editbox.cpp

@@ -999,7 +999,8 @@ namespace NLGUI
 			break;
 			// OTHER
 			default:
-				if ((rEDK.getChar() == KeyRETURN) && !_WantReturn)
+				bool isKeyRETURN = !rEDK.getKeyCtrl() && rEDK.getChar() == KeyRETURN;
+				if (isKeyRETURN && !_WantReturn)
 				{
 					// update historic.
 					if(_MaxHistoric)
@@ -1030,9 +1031,9 @@ namespace NLGUI
 					// If the char is not alphanumeric -> return.
 					//		if(!isalnum(ec.Char))
 					//			return
-					if( (rEDK.getChar()>=32) || (rEDK.getChar() == KeyRETURN) )
+					if( (rEDK.getChar()>=32) || isKeyRETURN )
 					{
-						if (rEDK.getChar() == KeyRETURN)
+						if (isKeyRETURN)
 						{
 							ucstring	copyStr= _InputString;
 							if ((uint) std::count(copyStr.begin(), copyStr.end(), '\n') >= _MaxNumReturn)
@@ -1049,7 +1050,7 @@ namespace NLGUI
 							cutSelection();
 						}
 
-						ucchar c = (rEDK.getChar() == KeyRETURN)?'\n':rEDK.getChar();
+						ucchar c = isKeyRETURN ? '\n' : rEDK.getChar();
 						if (isFiltered(c)) return;
 						switch(_EntryType)
 						{
@@ -1128,7 +1129,7 @@ namespace NLGUI
 							++ _CursorPos;
 							triggerOnChangeAH();
 						}
-						if (rEDK.getChar() == KeyRETURN)
+						if (isKeyRETURN)
 						{
 							CAHManager::getInstance()->runActionHandler(_AHOnEnter, this, _AHOnEnterParams);
 						}

code/nel/src/gui/group_html.cpp

@@ -1217,7 +1217,7 @@ namespace NLGUI
 								normal = value[MY_HTML_INPUT_SRC];
 
 							// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
-							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name;
+							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name + "|submit_button_type=image";
 
 							// Add the ctrl button
 							addButton (CCtrlButton::PushButton, name, normal, pushed.empty()?normal:pushed, over,
@@ -1241,7 +1241,15 @@ namespace NLGUI
 								text = value[MY_HTML_INPUT_VALUE];
 
 							// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
-							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name;
+							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name + "|submit_button_type=submit";
+							if (text.size() > 0)
+							{
+								// escape AH param separator
+								string tmp = text;
+								while(NLMISC::strFindReplace(tmp, "|", "|"))
+									;
+								param = param + "|submit_button_value=" + tmp;
+							}
 
 							// Add the ctrl button
 							if (!_Paragraph)
@@ -3638,14 +3646,18 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	void CGroupHTML::submitForm (uint formId, const char *submitButtonName)
+	void CGroupHTML::submitForm (uint formId, const char *submitButtonType, const char *submitButtonName, const char *submitButtonValue, sint32 x, sint32 y)
 	{
 		// Form id valid ?
 		if (formId < _Forms.size())
 		{
 			_PostNextTime = true;
 			_PostFormId = formId;
+			_PostFormSubmitType = submitButtonType;
 			_PostFormSubmitButton = submitButtonName;
+			_PostFormSubmitValue = submitButtonValue;
+			_PostFormSubmitX = x;
+			_PostFormSubmitY = y;
 		}
 	}
 
@@ -3918,9 +3930,22 @@ namespace NLGUI
 						}
 					}
 
-					// Add the button coordinates
+					if (_PostFormSubmitType == "image")
-					HTParseFormInput(formfields, (_PostFormSubmitButton + "_x=0").c_str());
+					{
-					HTParseFormInput(formfields, (_PostFormSubmitButton + "_y=0").c_str());
+						// Add the button coordinates
+						if (_PostFormSubmitButton.find_first_of("[") == string::npos)
+						{
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "_x=" + NLMISC::toString(_PostFormSubmitX)).c_str());
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "_y=" + NLMISC::toString(_PostFormSubmitY)).c_str());
+						}
+						else
+						{
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + NLMISC::toString(_PostFormSubmitX)).c_str());
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + NLMISC::toString(_PostFormSubmitY)).c_str());
+						}
+					}
+					else
+						HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + _PostFormSubmitValue).c_str());
 
 					// Add custom params
 					addHTTPPostParams(formfields, _TrustedDomain);

code/nel/src/gui/group_menu.cpp

@@ -2200,7 +2200,7 @@ namespace NLGUI
 			if( editorMode )
 				_Extends = std::string( (const char*)prop );
 
-			CGroupMenu *gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId(prop));
+			CGroupMenu *gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId(prop.str()));
 			if (!gm)
 			{
 				gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:" + std::string((const char*)prop)));

code/nel/src/gui/interface_anim.cpp

@@ -74,7 +74,7 @@ namespace NLGUI
 		}
 
 		//
-		if (!CInterfaceLink::splitLinkTargets (ptr, parentGroup, _Targets))
+		if (!CInterfaceLink::splitLinkTargets (ptr.str(), parentGroup, _Targets))
 		{
 			nlwarning ("no target for track");
 			return false;

code/nel/src/gui/interface_parser.cpp

@@ -1771,7 +1771,7 @@ namespace NLGUI
 		{
 			CInterfaceExprValue res;
 
-			if (CInterfaceExpr::eval(ptrVal2, res))
+			if (CInterfaceExpr::eval(ptrVal2.str(), res))
 			{
 				if (!res.toString())
 				{

code/nel/src/gui/widget_manager.cpp

@@ -2207,7 +2207,7 @@ namespace NLGUI
 		}
 
 		// Manage complex "Enter"
-		if (eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyRETURN)
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyRETURN && !eventDesc.getKeyCtrl() )
 		{
 			// If the  top window has Enter AH
 			CInterfaceGroup	*tw= getTopWindow();

code/nel/src/misc/CMakeLists.txt

@@ -1,6 +1,176 @@
 FILE(GLOB SRC *.cpp *.h config_file/*.cpp config_file/*.h)
 FILE(GLOB HEADERS ../../include/nel/misc/*.h)
 
+FILE(GLOB NLMISC_CDB
+	cdb.cpp ../../include/nel/misc/cdb.h
+	cdb_*.cpp ../../include/nel/misc/cdb_*.h
+)
+
+FILE(GLOB NLMISC_EVENT
+	events.cpp ../../include/nel/misc/events.h
+	event_*.cpp ../../include/nel/misc/event_*.h
+	*_event_*.cpp ../../include/nel/misc/*_event_*.h
+)
+
+FILE(GLOB NLMISC_DEBUG
+	debug.cpp ../../include/nel/misc/debug.h
+	report.cpp ../../include/nel/misc/report.h
+	log.cpp ../../include/nel/misc/log.h
+)
+
+FILE(GLOB NLMISC_FILESYSTEM
+	async_file_manager.cpp ../../include/nel/misc/async_file_manager.h
+	file.cpp ../../include/nel/misc/file.h
+	path.cpp ../../include/nel/misc/path.h
+	big_file.cpp ../../include/nel/misc/big_file.h
+	*_xml.cpp ../../include/nel/misc/*_xml.h
+	xml_*.cpp ../../include/nel/misc/xml_*.h
+)
+
+FILE(GLOB NLMISC_STREAM
+	*_stream.cpp ../../include/nel/misc/*_stream.h
+	stream.cpp ../../include/nel/misc/stream.h
+	stream_*.cpp ../../include/nel/misc/stream_*.h
+)
+
+FILE(GLOB NLMISC_DISPLAYER
+	displayer.cpp ../../include/nel/misc/displayer.h
+	*_displayer.cpp ../../include/nel/misc/*_displayer.h
+)
+
+FILE(GLOB NLMISC_MATH
+	plane.cpp ../../include/nel/misc/plane.h
+	../../include/nel/misc/plane_inline.h
+	polygon.cpp ../../include/nel/misc/polygon.h
+	quad.cpp ../../include/nel/misc/quad.h
+	quat.cpp ../../include/nel/misc/quat.h
+	rect.cpp ../../include/nel/misc/rect.h
+	rgba.cpp ../../include/nel/misc/rgba.h
+	triangle.cpp ../../include/nel/misc/triangle.h
+	uv.cpp ../../include/nel/misc/uv.h
+	vector*.cpp ../../include/nel/misc/vector*.h
+	aabbox.cpp ../../include/nel/misc/aabbox.h
+	algo.cpp ../../include/nel/misc/algo.h
+	bsphere.cpp ../../include/nel/misc/bsphere.h
+	fast_floor.cpp ../../include/nel/misc/fast_floor.h
+	geom_ext.cpp ../../include/nel/misc/geom_ext.h
+	line.cpp ../../include/nel/misc/line.h
+	matrix.cpp ../../include/nel/misc/matrix.h
+)
+
+FILE(GLOB NLMISC_PLATFORM
+	*_nl.cpp ../../include/nel/misc/*_nl.h
+	common.cpp ../../include/nel/misc/common.h
+	app_context.cpp ../../include/nel/misc/app_context.h
+	check_fpu.cpp ../../include/nel/misc/check_fpu.h
+	cpu_time_stat.cpp ../../include/nel/misc/cpu_time_stat.h
+	dummy_window.cpp ../../include/nel/misc/dummy_window.h
+	dynloadlib.cpp ../../include/nel/misc/dynloadlib.h
+	fast_mem.cpp ../../include/nel/misc/fast_mem.h
+	inter_window_msg_queue.cpp ../../include/nel/misc/inter_window_msg_queue.h
+	system_*.cpp ../../include/nel/misc/system_*.h
+	win32_util.cpp ../../include/nel/misc/win32_util.h
+	win_tray.cpp ../../include/nel/misc/win_tray.h
+)
+
+FILE(GLOB NLMISC_GENERIC
+	../../include/nel/misc/array_2d.h
+	*_memory.cpp ../../include/nel/misc/*_memory.h
+	buf_fifo.cpp ../../include/nel/misc/buf_fifo.h
+	../../include/nel/misc/callback.h
+	*_allocator.cpp ../../include/nel/misc/*_allocator.h
+	../../include/nel/misc/enum_bitset.h
+	fast_id_map.cpp ../../include/nel/misc/fast_id_map.h
+	hierarchical_timer.cpp ../../include/nel/misc/hierarchical_timer.h
+	../../include/nel/misc/historic.h
+	../../include/nel/misc/mutable_container.h
+	../../include/nel/misc/random.h
+	smart_ptr.cpp ../../include/nel/misc/smart_ptr.h
+	../../include/nel/misc/smart_ptr_inline.h
+	../../include/nel/misc/resource_ptr.h
+	../../include/nel/misc/resource_ptr_inline.h
+	bit_set.cpp ../../include/nel/misc/bit_set.h
+	stop_watch.cpp ../../include/nel/misc/stop_watch.h
+	../../include/nel/misc/twin_map.h
+	object_vector.cpp ../../include/nel/misc/object_vector.h
+	../../include/nel/misc/singleton.h
+	speaker_listener.cpp ../../include/nel/misc/speaker_listener.h
+	../../include/nel/misc/static_map.h
+	stl_block_list.cpp ../../include/nel/misc/stl_block_list.h
+)
+
+FILE(GLOB NLMISC_UTILITY
+	config_file.cpp ../../include/nel/misc/config_file.h
+	cf_*.cpp ../../include/nel/misc/cf_*.h
+	config_file/config_file.cpp config_file/config_file.h
+	config_file/cf_*.cpp config_file/cf_*.h
+	class_id.cpp ../../include/nel/misc/class_id.h
+	class_registry.cpp ../../include/nel/misc/class_registry.h
+	cmd_args.cpp ../../include/nel/misc/cmd_args.h
+	command.cpp ../../include/nel/misc/command.h
+	eid_translator.cpp ../../include/nel/misc/eid_translator.h
+	entity_id.cpp ../../include/nel/misc/entity_id.h
+	eval_num_expr.cpp ../../include/nel/misc/eval_num_expr.h
+	factory.cpp ../../include/nel/misc/factory.h
+	grid_traversal.cpp ../../include/nel/misc/grid_traversal.h
+	mouse_smoother.cpp ../../include/nel/misc/mouse_smoother.h
+	noise_value.cpp ../../include/nel/misc/noise_value.h
+	progress_callback.cpp ../../include/nel/misc/progress_callback.h
+	sheet_id.cpp ../../include/nel/misc/sheet_id.h
+	variable.cpp ../../include/nel/misc/variable.h
+	value_smoother.cpp ../../include/nel/misc/value_smoother.h
+)
+
+FILE(GLOB NLMISC_STRING
+	string_*.cpp ../../include/nel/misc/string_*.h
+	../../include/nel/misc/ucstring.h
+	unicode.cpp
+	sstring.cpp ../../include/nel/misc/sstring.h
+)
+
+FILE(GLOB NLMISC_I18N
+	diff_tool.cpp ../../include/nel/misc/diff_tool.h
+	i18n.cpp ../../include/nel/misc/i18n.h
+	words_dictionary.cpp ../../include/nel/misc/words_dictionary.h
+)
+
+FILE(GLOB NLMISC_THREAD
+	co_task.cpp ../../include/nel/misc/co_task.h
+	mutex.cpp ../../include/nel/misc/mutex.h
+	*_thread.cpp ../../include/nel/misc/*_thread.h
+	task_*.cpp ../../include/nel/misc/task_*.h
+	reader_writer.cpp ../../include/nel/misc/reader_writer.h
+	tds.cpp ../../include/nel/misc/tds.h
+	thread.cpp ../../include/nel/misc/thread.h
+)
+
+FILE(GLOB NLMISC_BITMAP
+	bitmap.cpp ../../include/nel/misc/bitmap.h
+	bitmap_*.cpp
+)
+
+FILE(GLOB NLMISC_CRYPT
+	md5.cpp ../../include/nel/misc/md5.h
+	sha1.cpp ../../include/nel/misc/sha1.h
+)
+
+SOURCE_GROUP("" FILES ${SRC} ${HEADERS})
+SOURCE_GROUP("cdb" FILES ${NLMISC_CDB})
+SOURCE_GROUP("event" FILES ${NLMISC_EVENT})
+SOURCE_GROUP("debug" FILES ${NLMISC_DEBUG})
+SOURCE_GROUP("platform" FILES ${NLMISC_PLATFORM})
+SOURCE_GROUP("filesystem" FILES ${NLMISC_FILESYSTEM})
+SOURCE_GROUP("stream" FILES ${NLMISC_STREAM})
+SOURCE_GROUP("displayer" FILES ${NLMISC_DISPLAYER})
+SOURCE_GROUP("math" FILES ${NLMISC_MATH})
+SOURCE_GROUP("generic" FILES ${NLMISC_GENERIC})
+SOURCE_GROUP("utility" FILES ${NLMISC_UTILITY})
+SOURCE_GROUP("bitmap" FILES ${NLMISC_BITMAP})
+SOURCE_GROUP("thread" FILES ${NLMISC_THREAD})
+SOURCE_GROUP("i18n" FILES ${NLMISC_I18N})
+SOURCE_GROUP("crypt" FILES ${NLMISC_CRYPT})
+SOURCE_GROUP("string" FILES ${NLMISC_STRING})
+
 NL_TARGET_LIB(nelmisc ${HEADERS} ${SRC})
 
 IF(WITH_GTK)

code/nel/src/misc/app_context.cpp

@@ -114,6 +114,7 @@ CApplicationContext::CApplicationContext()
 	DebugNeedAssert = false;
 	NoAssert = false;
 	AlreadyCreateSharedAmongThreads = false;
+	WindowedApplication = false;
 
 	contextReady();
 }
@@ -242,6 +243,16 @@ void CApplicationContext::setAlreadyCreateSharedAmongThreads(bool b)
 	AlreadyCreateSharedAmongThreads = b;
 }
 
+bool CApplicationContext::isWindowedApplication()
+{
+	return WindowedApplication;
+}
+
+void CApplicationContext::setWindowedApplication(bool b)
+{
+	WindowedApplication = b;
+}
+
 CLibraryContext::CLibraryContext(INelContext &applicationContext)
 : _ApplicationContext(&applicationContext)
 {
@@ -430,6 +441,16 @@ void CLibraryContext::setAlreadyCreateSharedAmongThreads(bool b)
 	_ApplicationContext->setAlreadyCreateSharedAmongThreads(b);
 }
 
+bool CLibraryContext::isWindowedApplication()
+{
+	return _ApplicationContext->isWindowedApplication();
+}
+
+void CLibraryContext::setWindowedApplication(bool b)
+{
+	_ApplicationContext->setWindowedApplication(b);
+}
+
 void initNelLibrary(NLMISC::CLibrary &lib)
 {
 	nlassert(lib.isLibraryLoaded());

code/nel/src/misc/co_task.cpp

@@ -43,20 +43,7 @@
 #else //NL_USE_THREAD_COTASK
 // some platform specifics
 #if defined (NL_OS_WINDOWS)
-//# define _WIN32_WINNT 0x0500
+#	define NL_WIN_CALLBACK CALLBACK
-# define NL_WIN_CALLBACK CALLBACK
-// Visual .NET won't allow Fibers for a Windows version older than 2000. However the basic features are sufficient for us, we want to compile them for all Windows >= 95
-# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0400)
-#  ifdef _WIN32_WINNT
-#   undef _WIN32_WINNT
-#  endif
-#  define _WIN32_WINNT 0x0400
-# endif
-
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #elif defined (NL_OS_UNIX)
 #	define NL_WIN_CALLBACK
 #	include <ucontext.h>

code/nel/src/misc/common.cpp

@@ -20,10 +20,7 @@
 #include "nel/misc/common.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
+#	include <ShellAPI.h>
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <io.h>
 #	include <tchar.h>
 #elif defined NL_OS_UNIX

code/nel/src/misc/debug.cpp

@@ -17,28 +17,8 @@
 #include "stdmisc.h"
 
 #include "nel/misc/types_nl.h"
-#include "nel/misc/debug.h"
-
-#ifdef HAVE_NELCONFIG_H
-#  include "nelconfig.h"
-#endif // HAVE_NELCONFIG_H
-
-#include "nel/misc/log.h"
-#include "nel/misc/displayer.h"
-#include "nel/misc/mem_displayer.h"
-#include "nel/misc/command.h"
-#include "nel/misc/report.h"
-#include "nel/misc/path.h"
-#include "nel/misc/variable.h"
-#include "nel/misc/system_info.h"
 
 #ifdef NL_OS_WINDOWS
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#	define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <direct.h>
 #	include <tchar.h>
 #	include <imagehlp.h>
@@ -59,6 +39,21 @@
 #	include <errno.h>
 #endif
 
+#include "nel/misc/debug.h"
+
+#ifdef HAVE_NELCONFIG_H
+#  include "nelconfig.h"
+#endif // HAVE_NELCONFIG_H
+
+#include "nel/misc/log.h"
+#include "nel/misc/displayer.h"
+#include "nel/misc/mem_displayer.h"
+#include "nel/misc/command.h"
+#include "nel/misc/report.h"
+#include "nel/misc/path.h"
+#include "nel/misc/variable.h"
+#include "nel/misc/system_info.h"
+
 #define NL_NO_DEBUG_FILES 1
 
 using namespace std;
@@ -1228,6 +1223,11 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 #endif // LOG_IN_FILE
 		DefaultMemDisplayer = new CMemDisplayer ("DEFAULT_MD");
 
+#ifdef NL_OS_WINDOWS
+		if (GetConsoleWindow() == NULL)
+			INelContext::getInstance().setWindowedApplication(true);
+#endif
+
 		initDebug2(logInFile);
 
 		INelContext::getInstance().setAlreadyCreateSharedAmongThreads(true);

code/nel/src/misc/displayer.cpp

@@ -18,6 +18,10 @@
 
 #include "nel/misc/types_nl.h"
 
+#ifndef NL_OS_WINDOWS
+#	define IsDebuggerPresent() false
+#endif
+
 #ifdef NL_OS_WINDOWS
 #	include <io.h>
 #	include <fcntl.h>
@@ -35,19 +39,6 @@
 
 #include "nel/misc/debug.h"
 
-#ifdef NL_OS_WINDOWS
-// these defines is for IsDebuggerPresent(). it'll not compile on windows 95
-// just comment this and the IsDebuggerPresent to compile on windows 95
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#		define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#else
-#	define IsDebuggerPresent() false
-#endif
-
 #include "nel/misc/displayer.h"
 
 using namespace std;

code/nel/src/misc/gtk_displayer.cpp

@@ -32,6 +32,7 @@
 #pragma comment(lib, "gthread-1.3.lib")
 #endif
 
+#include "nel/misc/app_context.h"
 #include "nel/misc/path.h"
 #include "nel/misc/command.h"
 #include "nel/misc/thread.h"
@@ -59,6 +60,14 @@ static GtkWidget *hrootbox = NULL, *scrolled_win2 = NULL;
 // Functions
 //
 
+CGtkDisplayer (const char *displayerName) : CWindowDisplayer(displayerName)
+{
+	needSlashR = false;
+	createLabel ("@Clear|CLEAR");
+
+	INelContext::getInstance().setWindowedApplication(true);
+}
+
 CGtkDisplayer::~CGtkDisplayer ()
 {
 	if (_Init)

code/nel/src/misc/log.cpp

@@ -19,11 +19,7 @@
 #include "nel/misc/log.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
 #	include <process.h>
-#	include <windows.h>
 #else
 #	include <unistd.h>
 #endif

code/nel/src/misc/mem_displayer.cpp

@@ -24,10 +24,6 @@
 #include "nel/misc/debug.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <imagehlp.h>
 #	pragma comment(lib, "imagehlp.lib")
 #	ifdef NL_OS_WIN64
@@ -103,7 +99,7 @@ static string getFuncInfo (DWORD_TYPE funcAddr, DWORD_TYPE stackAddr)
 		if (stop==0 && (parse[i] == ',' || parse[i] == ')'))
 		{
 			char tmp[32];
-			sprintf (tmp, "=0x%p", *((ULONG*)(stackAddr) + 2 + pos++));
+			sprintf(tmp, "=0x%p", *((DWORD_TYPE*)(stackAddr) + 2 + pos++));
 			str += tmp;
 		}
 		str += parse[i];

code/nel/src/misc/mutex.cpp

@@ -41,15 +41,6 @@ using namespace std;
 
 #ifdef NL_OS_WINDOWS
 
-// these defines are for IsDebuggerPresent(). It'll not compile on windows 95
-// just comment this and the IsDebuggerPresent to compile on windows 95
-#define _WIN32_WINDOWS	0x0410
-#ifndef NL_COMP_MINGW
-#	define WINVER			0x0400
-#	define NOMINMAX
-#endif
-#include <windows.h>
-
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif

code/nel/src/misc/p_thread.cpp

@@ -17,8 +17,8 @@
 
 #include "stdmisc.h"
 
-#include <nel/misc/types_nl.h>
+#include "nel/misc/types_nl.h"
-#include <nel/misc/debug.h>
+#include "nel/misc/debug.h"
 
 #ifdef NL_OS_UNIX
 

code/nel/src/misc/path.cpp

@@ -25,10 +25,6 @@
 #include "nel/misc/xml_pack.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <sys/types.h>
 #	include <sys/stat.h>
 #	include <direct.h>
@@ -858,6 +854,8 @@ string getname (dirent *de)
 void CPath::getPathContent (const string &path, bool recurse, bool wantDir, bool wantFile, vector<string> &result, class IProgressCallback *progressCallBack, bool showEverything)
 {
 	getInstance()->_FileContainer.getPathContent(path, recurse, wantDir, wantFile, result, progressCallBack, showEverything);
+
+	sort(result.begin(), result.end());
 }
 
 void CFileContainer::getPathContent (const string &path, bool recurse, bool wantDir, bool wantFile, vector<string> &result, class IProgressCallback *progressCallBack, bool showEverything)
@@ -960,8 +958,6 @@ void CFileContainer::getPathContent (const string &path, bool recurse, bool want
 			progressCallBack->popCropedValues ();
 		}
 	}
-
-	sort(result.begin(), result.end());
 }
 
 void CPath::removeAllAlternativeSearchPath ()

code/nel/src/misc/report.cpp

@@ -25,10 +25,6 @@
 #include "nel/misc/path.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <windowsx.h>
 #	include <winuser.h>
 #endif // NL_OS_WINDOWS

code/nel/src/misc/shared_memory.cpp

@@ -19,12 +19,7 @@
 #include "nel/misc/shared_memory.h"
 #include "nel/misc/debug.h"
 
-#ifdef NL_OS_WINDOWS
+#ifndef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#else
 #	include <sys/types.h>
 #	include <sys/ipc.h>
 #	include <sys/shm.h>

code/nel/src/misc/sstring.cpp

@@ -1731,7 +1731,9 @@ namespace NLMISC
 
 	double CSString::atof() const
 	{
-		return ::atof(c_str());
+		double val;
+		NLMISC::fromString(*this, val);
+		return val;
 	}
 
 	bool CSString::readFromFile(const CSString& fileName)

code/nel/src/misc/stdmisc.h

@@ -42,12 +42,20 @@
 #include <utility>
 #include <vector>
 
-#ifdef _WIN32
+#include <nel/misc/types_nl.h>
-#	ifndef __MINGW32__
+
-		#define NOMINMAX
+#ifdef NL_OS_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	define _WIN32_WINDOWS 0x0410
+#	ifndef _WIN32_WINNT
+#		define _WIN32_WINNT 0x0400
+#	endif
+#	ifndef NL_COMP_MINGW
+#		define WINVER 0x0400
+#		define NOMINMAX
 #	endif
 #	include <WinSock2.h>
-#	include <windows.h>
+#	include <Windows.h>
 #endif
 
 #endif // NL_STDMISC_H

code/nel/src/misc/system_info.cpp

@@ -19,10 +19,6 @@
 #include "nel/misc/system_info.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <WinNT.h>
 #	include <tchar.h>
 #	include <intrin.h>

code/nel/src/misc/system_utils.cpp

@@ -18,16 +18,12 @@
 #include "nel/misc/system_utils.h"
 
 #ifdef NL_OS_WINDOWS
-	#ifndef NL_COMP_MINGW
+#	include <ObjBase.h>
-		#define NOMINMAX
+#	ifdef _WIN32_WINNT_WIN7
-	#endif
-	#include <windows.h>
-
-	#ifdef _WIN32_WINNT_WIN7
 		// only supported by Windows 7 Platform SDK
-		#include <ShObjIdl.h>
+#		include <ShObjIdl.h>
-		#define TASKBAR_PROGRESS 1
+#		define TASKBAR_PROGRESS 1
-	#endif
+#	endif
 #endif
 
 #ifdef DEBUG_NEW

code/nel/src/misc/time_nl.cpp

@@ -21,10 +21,7 @@
 #include "nel/misc/thread.h"
 
 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
+#	include <MMSystem.h>
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #elif defined (NL_OS_UNIX)
 #	include <sys/time.h>
 #	include <unistd.h>

code/nel/src/misc/win32_util.cpp

@@ -20,8 +20,6 @@
 
 #ifdef NL_OS_WINDOWS
 
-#include <windows.h>
-
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif

code/nel/src/misc/win_displayer.cpp

@@ -18,10 +18,6 @@
 #include "nel/misc/win_displayer.h"
 
 #ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-#	define NOMINMAX
-#endif
-#include <windows.h>
 #include <windowsx.h>
 #include <winuser.h>
 #include <cstring>
@@ -30,6 +26,7 @@
 #include <commctrl.h>
 #include <ctime>
 
+#include "nel/misc/app_context.h"
 #include "nel/misc/path.h"
 #include "nel/misc/command.h"
 #include "nel/misc/thread.h"
@@ -45,6 +42,13 @@ namespace NLMISC {
 
 static CHARFORMAT2 CharFormat;
 
+CWinDisplayer::CWinDisplayer(const char *displayerName) : CWindowDisplayer(displayerName), Exit(false)
+{
+	needSlashR = true;
+	createLabel("@Clear|CLEAR");
+
+	INelContext::getInstance().setWindowedApplication(true);
+}
 
 CWinDisplayer::~CWinDisplayer ()
 {

code/nel/src/misc/win_event_emitter.cpp

@@ -22,10 +22,6 @@
 #include "nel/misc/event_server.h"
 
 #ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-#define NOMINMAX
-#endif
-#include <windows.h>
 #include <windowsx.h>
 
 /**

code/nel/src/misc/words_dictionary.cpp

@@ -251,7 +251,7 @@ void CWordsDictionary::exactLookupByKey( const CSString& key, CVectorSString& re
  */
 inline CSString CWordsDictionary::makeResult( const CSString &key, const CSString &word )
 {
-	return key + CSString(": ") + word;
+	return key + ": " + word.c_str();
 }
 
 

code/nel/src/net/service.cpp

@@ -23,12 +23,6 @@
 #ifdef NL_OS_WINDOWS
 // these defines is for IsDebuggerPresent(). it'll not compile on windows 95
 // just comment this and the IsDebuggerPresent to compile on windows 95
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#		define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <direct.h>
 #elif defined NL_OS_UNIX
 #	include <unistd.h>

code/nel/src/net/stdnet.h

@@ -17,7 +17,9 @@
 #include "nel/misc/types_nl.h"
 
 #ifdef NL_OS_WINDOWS
+#	define _WIN32_WINDOWS	0x0410
 #	ifndef NL_COMP_MINGW
+#		define WINVER			0x0400
 #		define NOMINMAX
 #	endif
 #	include <winsock2.h>

code/nel/src/pacs/local_retriever.cpp

@@ -2253,7 +2253,7 @@ bool	NLPACS::CLocalRetriever::checkSurfaceIntegrity(uint surf, NLMISC::CVector t
 
 				for (k=0; k+1<ochain.getVertices().size(); ++k)
 				{
-					edges.push_back(make_pair<CVector2s, CVector2s>(ochain[k], ochain[k+1]));
+					edges.push_back(std::pair<CVector2s, CVector2s>(ochain[k], ochain[k+1]));
 				}
 			}
 		}

code/nel/src/sound/CMakeLists.txt

@@ -86,6 +86,7 @@ NL_TARGET_LIB(nelsound ${HEADERS} ${SRC})
 
 
 INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nelsound ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
 

code/nel/src/sound/sound_animation.cpp

@@ -176,7 +176,10 @@ void CSoundAnimation::load()
 				throw NLMISC::Exception("Invalid sound animation marker");
 			}
 
-			marker->setTime((float) atof(time));
+			float val;
+			NLMISC::fromString(time, val);
+
+			marker->setTime(val);
 			xmlFree ((void*)time);
 
 

code/nel/tools/3d/ligo/plugin_max/script.cpp

@@ -1739,14 +1739,14 @@ bool MakeSnapShot (NLMISC::CBitmap &snapshot, const NL3D::CTileBank &tileBank, c
 		float posY = config.CellSize * (float)ymin;
 
 		// Use NELU
-		if (CNELU::init (oversampledWidth, oversampledHeight, CViewport(), 32, true, NULL, true))
+		if (CNELU::init (oversampledWidth, oversampledHeight, CViewport(), 32, true, NULL, false, true)) // FIXME: OpenGL not working correctly, offscreen not available in Direct3D
 		{
 			// Setup the camera
 			CNELU::Camera->setTransformMode (ITransformable::DirectMatrix);
 			CMatrix view;
 			view.setPos (CVector (width/2 + posX, height/2 + posY, width));
 			view.setRot (CVector::I, -CVector::K, CVector::J);
-			CNELU::Camera->setFrustum (width, height, 0.1f, 1000.f, false);
+			CNELU::Camera->setFrustum (width, height, 0.1f, 10000.f, false);
 			CNELU::Camera->setMatrix (view);
 
 			// Create a Landscape.
@@ -1766,12 +1766,17 @@ bool MakeSnapShot (NLMISC::CBitmap &snapshot, const NL3D::CTileBank &tileBank, c
 			theLand->enableAdditive (true);
 			theLand->Landscape.setRefineMode (true);
 
+			// theLand->Landscape.setupStaticLight(CRGBA(255, 255, 255), CRGBA(0, 0, 0), 1.0f);
+			// theLand->Landscape.setThreshold(0.0005);
+
 			// Enbable automatique lighting
 	#ifndef NL_DEBUG
-			theLand->Landscape.enableAutomaticLighting (true);
+			// theLand->Landscape.enableAutomaticLighting (true);
-			theLand->Landscape.setupAutomaticLightDir (CVector (0, 0, -1));
+			// theLand->Landscape.setupAutomaticLightDir (CVector (0, 0, -1));
 	#endif // NL_DEBUG
 
+			// theLand->Landscape.updateLightingAll();
+
 			// Clear the backbuffer and the alpha
 			CNELU::clearBuffers(CRGBA(255,0,255,0));
 
@@ -1851,7 +1856,7 @@ bool MakeSnapShot (NLMISC::CBitmap &snapshot, const NL3D::CTileBank &tileBank, c
 Value* make_snapshot_cf (Value** arg_list, int count)
 {
 	// Make sure we have the correct number of arguments (7)
-	check_arg_count(check_zone_with_template, 7, count);
+	check_arg_count(NeLLigoMakeSnapShot, 7, count);
 
 	// Check to see if the arguments match up to what we expect
 	char *message = "NeLLigoMakeSnapShot [Object] [Snapshot filename] [xMin] [xMax] [yMin] [yMax] [Error in dialog]";
@@ -1903,11 +1908,11 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 			else
 			{
 				// Build a filename
-				char drive[512];
+				char drivetga[512];
-				char path[512];
+				char pathtga[512];
-				char name[512];
+				char nametga[512];
-				char ext[512];
+				char exttga[512];
-				_splitpath (fileName.c_str(), drive, path, name, ext);
+				_splitpath (fileName.c_str(), drivetga, pathtga, nametga, exttga);
 
 				// Build the zone
 				CZone zone;
@@ -1970,7 +1975,7 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 								{
 									// Build the snap shot filename
 									char outputFilenameSnapShot[512];
-									_makepath (outputFilenameSnapShot, drive, path, name, ".tga");
+									_makepath (outputFilenameSnapShot, drivetga, pathtga, nametga, ".tga");
 
 									// Output the snap shot
 									COFile outputSnapShot;
@@ -2011,10 +2016,10 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 
 										// Write the zone
 										COFile outputLigoZone;
-										_makepath (outputFilenameSnapShot, drive, path, name, ".ligozone");
+										_makepath (outputFilenameSnapShot, drivetga, pathtga, nametga, ".ligozone");
 
 										// Catch exception
-										try
+										/*try
 										{
 											// Open the selected zone file
 											if (outputLigoZone.open (outputFilenameSnapShot))
@@ -2043,7 +2048,7 @@ Value* make_snapshot_cf (Value** arg_list, int count)
 											char tmp[512];
 											smprintf (tmp, 512, "Error while loading the file %s : %s", fileName, e.what());
 											CMaxToLigo::errorMessage (tmp, "NeL Ligo export zone", *MAXScript_interface, errorInDialog);
-										}
+										}*/
 									}
 									else
 									{

code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp

@@ -2144,6 +2144,8 @@ void appendLightmapLog (COFile &outputLog, const char *lightmapName, const vecto
 bool CExportNel::calculateLM( CMesh::CMeshBuild *pZeMeshBuild, CMeshBase::CMeshBaseBuild *pZeMeshBaseBuild, INode& ZeNode, 
 							TimeValue tvTime, uint firstMaterial, bool outputLightmapLog)
 {
+	nldebug("Calculate LM: '%s'", ZeNode.GetName());
+
 	DWORD t = timeGetTime();
 
 	uint32 i, j;

code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp

@@ -338,6 +338,8 @@ get_selected_tile_cf(Value** arg_list, int count)
 				if (tri->rpatch->tileSel[i])
 					array->append(Integer::intern(i+1));
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -383,6 +385,8 @@ get_selected_patch_cf(Value** arg_list, int count)
 				if (tri->patch.patchSel[i])
 					array->append(Integer::intern(i+1));
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -428,6 +432,8 @@ get_selected_vertex_cf(Value** arg_list, int count)
 				if (tri->patch.vertSel[i])
 					array->append(Integer::intern(i+1));
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -617,6 +623,8 @@ set_vertex_count_cf(Value** arg_list, int count)
 		{
 			nRet=tri->patch.numVerts;
 		}
+		if (os.obj != tri)
+			delete tri;
 	}
 
 	return Integer::intern(nRet);
@@ -655,6 +663,8 @@ set_vector_count_cf(Value** arg_list, int count)
 		{
 			nRet=tri->patch.numVecs;
 		}
+		if (os.obj != tri)
+			delete tri;
 	}
 
 	return Integer::intern(nRet);
@@ -702,6 +712,8 @@ set_vertex_pos_cf(Value** arg_list, int count)
 				node->NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE); 
 				ip->RedrawViews(ip->GetTime());
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -750,6 +762,8 @@ set_vector_pos_cf(Value** arg_list, int count)
 				node->NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE); 
 				ip->RedrawViews(ip->GetTime());
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -792,6 +806,8 @@ get_vertex_pos_cf(Value** arg_list, int count)
 			{
 				vRet=new Point3Value (tri->patch.verts[nVertex].p);
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -834,6 +850,8 @@ get_vector_pos_cf(Value** arg_list, int count)
 			{
 				vRet=new Point3Value (tri->patch.vecs[nVertex].p);
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -877,6 +895,8 @@ get_edge_vect1_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].vec12;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -919,6 +939,8 @@ get_edge_vect2_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].vec21;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -961,6 +983,8 @@ get_edge_vert1_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].v1;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -1004,6 +1028,8 @@ get_edge_vert2_cf(Value** arg_list, int count)
 			{
 				nVert=tri->patch.edges[nEdge].v2;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -1050,6 +1076,8 @@ get_sel_edge_cf(Value** arg_list, int count)
 					array->append(Integer::intern(i+1));
 					//array->data[j++]=;
 			}
+			if (os.obj != tri)
+				delete tri;
 		}
 	}
 
@@ -1158,6 +1186,8 @@ set_tile_steps_cf(Value** arg_list, int count)
 				nTess=5;
 			tri->rpatch->rTess.TileTesselLevel=nTess;
 			tri->rpatch->InvalidateChannels (PART_ALL);
+			if (os.obj != tri)
+				delete tri;
 		}	
 		if (bRet)
 		{

code/nel/tools/3d/plugin_max/nel_patch_edit/editpat.h

@@ -755,6 +755,7 @@ class EditPatchMod : public Modifier, IPatchOps, IPatchSelect, ISubMtlAPI, Attac
 		TCHAR *GetObjectName() { return GetString(IDS_TH_EDITPATCH); }
 		void ActivateSubobjSel(int level, XFormModes& modes );
 		int NeedUseSubselButton() { return 0; }
+		void SelectSubPatch(int index);
 		void SelectSubComponent( HitRecord *hitRec, BOOL selected, BOOL all, BOOL invert );
 		void ClearSelection(int selLevel);
 		void SelectAll(int selLevel);

code/nel/tools/3d/plugin_max/nel_patch_edit/np.cpp

@@ -84,6 +84,31 @@
  *>	Copyright(c) 1994, All Rights Reserved.
  **********************************************************************/
 #include "stdafx.h"
+
+#if MAX_VERSION_MAJOR >= 14
+#	include <maxscript/maxscript.h>
+#	include <maxscript/foundation/3dmath.h>
+#	include <maxscript/foundation/numbers.h>
+#	include <maxscript/maxwrapper/maxclasses.h>
+#	include <maxscript/foundation/streams.h>
+#	include <maxscript/foundation/mxstime.h>
+#	include <maxscript/maxwrapper/mxsobjects.h>
+#	include <maxscript/compiler/parser.h>
+#	include <maxscript/macros/define_instantiation_functions.h>
+#else
+#	include <MaxScrpt/maxscrpt.h>
+#	include <MaxScrpt/3dmath.h>
+//	Various MAX and MXS includes
+#	include <MaxScrpt/Numbers.h>
+#	include <MaxScrpt/MAXclses.h>
+#	include <MaxScrpt/Streams.h>
+#	include <MaxScrpt/MSTime.h>
+#	include <MaxScrpt/MAXObj.h>
+#	include <MaxScrpt/Parser.h>
+//	define the new primitives using macros from SDK
+#	include <MaxScrpt/definsfn.h>
+#endif
+
 #include "editpat.h"
 #include "../nel_patch_lib/vertex_neighborhood.h"
 
@@ -855,3 +880,67 @@ void ResetVert (PatchMesh *patch)
 	patch->computeInteriors();
 	patch->InvalidateGeomCache ();
 }
+
+def_visible_primitive(turn_patch, "RykolTurnPatch");
+
+Value *turn_patch_cf (Value** arg_list, int count)
+{
+	// Make sure we have the correct number of arguments (2)
+	check_arg_count(RykolTurnPatch, 3, count);
+
+	// Check to see if the arguments match up to what we expect
+	// We want to use 'TurnAllTexturesOn <object to use>'
+	type_check(arg_list[0], MAXNode, "RykolTurnPatch [Node] [Modifier] [Patch]");
+    type_check(arg_list[1], MAXModifier, "RykolTurnPatch [Node] [Modifier] [Patch]"); 
+	type_check(arg_list[2], Integer, "RykolTurnPatch [Node] [Modifier] [Patch]");
+
+	// Get a good interface pointer
+	Interface *ip = MAXScript_interface;
+
+	// Get a INode pointer from the argument passed to us
+	INode *node = arg_list[0]->to_node();
+	nlassert (node);
+
+	// Get a Object pointer
+	ObjectState os = node->EvalWorldState(ip->GetTime()); 
+
+	// ok ?
+	bool bRet=false;
+
+	if (os.obj)
+	{
+		// Get class id
+		if (os.obj->CanConvertToType(RYKOLPATCHOBJ_CLASS_ID)) 
+		{
+			bRet = true;
+			RPO *tri = (RPO *)os.obj->ConvertToType(ip->GetTime(), RYKOLPATCHOBJ_CLASS_ID);
+			if (tri)
+			{
+				Modifier *mod = arg_list[1]->to_modifier();
+				if (mod)
+				{
+					EditPatchMod *epmod = (EditPatchMod *)mod;
+					epmod->ClearSelection(EP_PATCH);
+					epmod->SelectSubPatch(arg_list[2]->to_int() - 1);
+					epmod->DoPatchTurn(true);
+					epmod->ClearSelection(EP_PATCH);
+				}
+				else
+				{
+					bRet = false;
+				}
+			}
+			// Note that the TriObject should only be deleted
+			// if the pointer to it is not equal to the object
+			// pointer that called ConvertToType()
+			if (os.obj != tri)
+				delete tri;
+		
+			// redraw and update
+			node->NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE); 
+			ip->RedrawViews(ip->GetTime());
+		}
+	}
+
+	return bRet?&true_value:&false_value;
+}

code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_selection.cpp

@@ -236,6 +236,50 @@ void EditPatchMod::SetSelLevel(DWORD level)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
+void EditPatchMod::SelectSubPatch(int index)
+{
+	if (!ip)
+		return; 
+	TimeValue t = ip->GetTime();
+
+	ip->ClearCurNamedSelSet();
+
+	ModContextList mcList;
+	INodeTab nodes;
+	ip->GetModContexts(mcList, nodes);
+
+	for (int i = 0; i < mcList.Count(); i++)
+	{
+		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
+	
+		if (!patchData)
+			return;
+		
+		RPatchMesh *rpatch;
+		PatchMesh *patch = patchData->TempData(this)->GetPatch(t, rpatch);
+		if (!patch)
+			return;
+		
+		patchData->BeginEdit(t);
+		if (theHold.Holding()) 
+			theHold.Put(new PatchRestore(patchData, this, patch, rpatch, "SelectSubComponent"));
+
+		patch->patchSel.Set(index);
+
+		patchData->UpdateChanges(patch, rpatch, FALSE);
+		if (patchData->tempData)
+		{
+			patchData->tempData->Invalidate(PART_SELECT);
+		}
+	}
+	PatchSelChanged();
+		
+	UpdateSelectDisplay();
+	NotifyDependents(FOREVER, PART_SELECT, REFMSG_CHANGE);
+}
+
+// ------------------------------------------------------------------------------------------------------------------------------------------------------
+
 // Select a subcomponent within our object(s).  WARNING! Because the HitRecord list can
 // indicate any of the objects contained within the group of patches being edited, we need
 // to watch for control breaks in the patchData pointer within the HitRecord!

code/nel/tools/3d/plugin_max/nel_patch_paint/keys.cfg

@@ -176,6 +176,7 @@ LockBorders			= KeyL;
 ZoomIn				= Key1;
 ZoomOut				= Key2;
 GetState			= Key3;
+ResetPatch			= KeyF10;
 
 /***************
  *This is the the light settings

code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp

@@ -145,7 +145,7 @@ std::vector<CZoneSymmetrisation> symVector;
 
 // Painter modes
 enum TModePaint { ModeTile, ModeColor, ModeDisplace};
-enum TModeMouse { ModePaint, ModeSelect, ModePick, ModeFill, ModeGetState };
+enum TModeMouse { ModePaint, ModeSelect, ModePick, ModeFill, ModeGetState, ModeResetPatch };
 
 /*-------------------------------------------------------------------*/
 
@@ -2585,6 +2585,13 @@ void	mainproc(CScene& scene, CEventListenerAsync& AsyncListener, CEvent3dMouseLi
 		// Set mode
 		modeSelect=ModeGetState;
 
+	// Mode reset zone
+	if (AsyncListener.isKeyDown ((TKey)PainterKeys[ResetPatch]))
+	{
+		// Set mode
+		modeSelect=ModeResetPatch;
+	}
+
 	// Mode picking
 	if (AsyncListener.isKeyDown ((TKey)PainterKeys[Fill0]))
 	{
@@ -2891,6 +2898,8 @@ void	mainproc(CScene& scene, CEventListenerAsync& AsyncListener, CEvent3dMouseLi
 		SetCursor (bankCont->HFill);
 	else if (pData->pobj->TileTrick)
 		SetCursor (bankCont->HTrick);
+	else if (modeSelect==ModeResetPatch)
+		SetCursor (LoadCursor (NULL, IDC_NO));
 	else
 		SetCursor (LoadCursor (NULL, IDC_ARROW));
 
@@ -3034,7 +3043,7 @@ private:
 	// Callback on mouse events
 	virtual void operator ()(const CEvent& event)
 	{
-		if (event==EventDestroyWindowId)
+		if (event==EventDestroyWindowId || event==EventCloseWindowId)
 		{
 			WindowActive=false;
 		}
@@ -3140,9 +3149,30 @@ private:
 								_FillTile.fillColor (mesh1, patch, _VectMesh, maxToNel (color1), (uint16)(256.f*opa1), PaintColor);
 
 							else if (nModeTexture==ModeDisplace)
-								// Fill this patch with the current color
+								// Fill this patch with the current displace
 								_FillTile.fillDisplace (mesh1, patch, _VectMesh, bank);
 						}
+						else if (modeSelect==ModeResetPatch)
+						{
+							int np = _VectMesh[mesh1].PMesh->numPatches;
+							for (int pp = 0; pp < np; ++pp)
+							{
+								// Fill default tile
+								_FillTile.fillTile (mesh1, pp, _VectMesh, -1, 0, 0, true, bank);
+
+								// Fill default color
+								_FillTile.fillColor (mesh1, pp, _VectMesh, CRGBA(255, 255, 255), 256, PaintColor);
+
+								// Backup current displace, fill default, restore
+								int bkdt = _Pobj->DisplaceTile;
+								int bkdts = _Pobj->DisplaceTileSet;
+								_Pobj->DisplaceTile = 0;
+								_Pobj->DisplaceTileSet = -1;
+								_FillTile.fillDisplace (mesh1, pp, _VectMesh, bank);
+								_Pobj->DisplaceTile = bkdt;
+								_Pobj->DisplaceTileSet = bkdts;
+							}
+						}
 					}
 				}
 				// Pick with right mouse
@@ -4095,7 +4125,7 @@ DWORD WINAPI myThread (LPVOID vData)
 
 			// Create a Landscape.
 			CLandscapeModel	*TheLand= (CLandscapeModel*)CNELU::Scene->createModel(LandscapeModelId);
-			TheLand->Landscape.setTileNear (1000.f);
+			TheLand->Landscape.setTileNear (10000.f);
 			TheLand->Landscape.TileBank=bank;
 
 			// Enbable automatique lighting
@@ -4192,7 +4222,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			mat.setPos(P);
 			CNELU::Camera->setTransformMode (ITransformable::DirectMatrix);
 			CNELU::Camera->setMatrix (mat);
-			CNELU::Camera->setPerspective( 75.f*(float)Pi/180.f/*vp->GetFOV()*/, 1.33f, 0.1f, 1000.f);
+			CNELU::Camera->setPerspective( 75.f*(float)Pi/180.f/*vp->GetFOV()*/, 1.33f, 0.1f, 10000.f);
 
 			// Resize the sym vector
 			symVector.resize (pData->VectMesh.size());
@@ -4257,6 +4287,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			CNELU::EventServer.addListener (EventMouseUpId, &listener);
 			CNELU::EventServer.addListener (EventMouseDblClkId, &listener);
 			CNELU::EventServer.addListener (EventDestroyWindowId, &listener);
+			CNELU::EventServer.addListener (EventCloseWindowId, &listener);
 			CNELU::EventServer.addListener (EventKeyDownId, &listener);
 
 			// Camera position
@@ -4326,6 +4357,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			CNELU::EventServer.removeListener (EventMouseDblClkId, &listener);
 			CNELU::EventServer.removeListener (EventKeyDownId, &listener);
 			CNELU::EventServer.removeListener (EventDestroyWindowId, &listener);
+			CNELU::EventServer.removeListener (EventCloseWindowId, &listener);
 
 			// End.
 			//========

code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.cpp

@@ -43,6 +43,7 @@ uint PainterKeys[KeyCounter]=
 	Key1,
 	Key2,
 	KeyI,
+	KeyF10,
 };
 
 // Keys
@@ -77,6 +78,7 @@ const char* PainterKeysName[KeyCounter]=
 	"ZoomIn",
 	"ZoomOut",
 	"GetState",
+	"ResetPatch",
 };
 
 // Light settings

code/nel/tools/3d/plugin_max/nel_patch_paint/paint_ui.h

@@ -122,6 +122,7 @@ enum PainterKeysType
 	ZoomIn,
 	ZoomOut,
 	GetState,
+	ResetPatch,
 	KeyCounter
 };
 

code/nel/tools/3d/plugin_max/scripts/nel_orient_zones.ms

@@ -0,0 +1,124 @@
+
+gc()
+nodes = getCurrentSelection()
+max select none
+clearselection()
+
+undo off
+(
+	for cnode in nodes do
+	(
+		if (classof cnode) == Editable_Patch or (classof cnode) == RklPatch then 
+		(
+			print cnode.name
+			selectmore cnode
+			if (classof cnode) == Editable_Patch and (classof cnode) != RklPatch then
+			(
+				modPanel.addModToSelection (NeL_Convert ()) ui:on
+			)
+			modPanel.addModToSelection (NeL_Edit ()) ui:on
+			setCommandPanelTaskMode #modify
+			cmod = modpanel.getCurrentObject()
+			pcount = (GetRykolPatchCount cnode)
+			print pcount
+			for p = 1 to pcount do
+			(
+				--print p
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				vref = (NeLGetPatchVertex cnode p 3)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				ref = (GetRykolVertexPos cnode vref)
+				normal = (cross (end - begin) (ref - begin))
+				normal = (normalize normal)
+					
+				rotnormal = (point3 0 0 0)
+				if (normal.z > 0.9) then
+				(
+					--print "x normal"
+					rotnormal = (normal * (rotateXMatrix -90))
+				)
+				else
+				(
+					normal.z = 0
+					normal = (normalize normal)
+					rotnormal = (normal * (rotateZMatrix -90))
+				)
+				--print rotnormal
+				
+				-- print normal
+				-- print rotnormal
+				-- print begin
+				-- print end
+				dir = (normalize (end - begin))
+				-- print dir
+				score1 = (dot dir rotnormal)
+					
+				RykolTurnPatch cnode cmod (p)
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				dir = (normalize (end - begin))
+				score2 = (dot dir rotnormal)
+					
+				RykolTurnPatch cnode cmod (p)
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				dir = (normalize (end - begin))
+				score3 = (dot dir rotnormal)
+					
+				RykolTurnPatch cnode cmod (p)
+				vbegin = (NeLGetPatchVertex cnode p 1)
+				vend = (NeLGetPatchVertex cnode p 2)
+				begin = (GetRykolVertexPos cnode vbegin)
+				end = (GetRykolVertexPos cnode vend)
+				dir = (normalize (end - begin))
+				score4 = (dot dir rotnormal)
+				
+				-- print score1
+				-- print score2
+				-- print score3
+				-- print score4
+				
+				if (score1 > score2 and score1 > score3 and score1 > score4) then
+				(
+					-- print "score 1"
+					RykolTurnPatch cnode cmod (p)
+				)
+				else if (score2 > score3 and score2 > score4) then
+				(
+					-- print "score 2"
+					RykolTurnPatch cnode cmod (p)
+					RykolTurnPatch cnode cmod (p)
+				)
+				else if (score3 > score4) then
+				(
+					-- print "score 3"
+					RykolTurnPatch cnode cmod (p)
+					RykolTurnPatch cnode cmod (p)
+					RykolTurnPatch cnode cmod (p)
+				)
+				else
+				(
+					-- print "score 4"
+				)
+			)
+			maxOps.CollapseNode cnode off
+			max select none
+		)
+	)
+)
+
+max select none
+clearselection()
+undo off
+(
+	for cnode in nodes do
+	(
+		selectmore cnode
+	)
+)