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

Merged default

Browse source
This commit is contained in:
dfighter1985 2014-05-14 18:01:15 +02:00
parent 31f1d3af16
commit 4e8fb9f59c
45 changed files with 473 additions and 641 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/CMakeModules/FindDirectXSDK.cmake
View file

@ -27,7 +27,7 @@ FIND_PATH(DXSDK_DIR
MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME) MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
FIND_LIBRARY(${MYLIBRARY} FIND_LIBRARY(${MYLIBRARY}
NAMES ${MYLIBRARYNAME} NAMES ${MYLIBRARYNAME}
PATHS HINTS
"${DXSDK_LIBRARY_DIR}" "${DXSDK_LIBRARY_DIR}"
) )
ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME) ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
@ -36,11 +36,16 @@ IF(DXSDK_DIR)
SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include") SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include")
IF(TARGET_X64) IF(TARGET_X64)
SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x64") SET(DXSDK_LIBRARY_DIRS ${DXSDK_DIR}/Lib/x64 ${DXSDK_DIR}/lib/amd64)
ELSE(TARGET_X64) ELSE(TARGET_X64)
SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x86") SET(DXSDK_LIBRARY_DIRS ${DXSDK_DIR}/Lib/x86 ${DXSDK_DIR}/lib)
ENDIF(TARGET_X64) ENDIF(TARGET_X64)
FIND_PATH(DXSDK_LIBRARY_DIR
dxguid.lib
PATHS
${DXSDK_LIBRARY_DIRS})
FIND_DXSDK_LIBRARY(DXSDK_GUID_LIBRARY dxguid) FIND_DXSDK_LIBRARY(DXSDK_GUID_LIBRARY dxguid)
FIND_DXSDK_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8) FIND_DXSDK_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8)
FIND_DXSDK_LIBRARY(DXSDK_DSOUND_LIBRARY dsound) FIND_DXSDK_LIBRARY(DXSDK_DSOUND_LIBRARY dsound)

4
code/CTestConfig.cmake
View file

@ -8,6 +8,6 @@ set(CTEST_PROJECT_NAME "RyzomCore")
set(CTEST_NIGHTLY_START_TIME "00:00:00 CST") set(CTEST_NIGHTLY_START_TIME "00:00:00 CST")
set(CTEST_UPDATE_TYPE "hg") set(CTEST_UPDATE_TYPE "hg")
set(CTEST_DROP_METHOD "http") set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "www.opennel.org") set(CTEST_DROP_SITE "ci.ryzomcore.org")
set(CTEST_DROP_LOCATION "/cdash/submit.php?project=RyzomCore") set(CTEST_DROP_LOCATION "/submit.php?project=RyzomCore")
set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_DROP_SITE_CDASH TRUE)

1
code/nel/include/nel/3d/stereo_display.h
View file

@ -60,7 +60,6 @@ public:
{ {
StereoDisplay, StereoDisplay,
StereoHMD, StereoHMD,
StereoNGHMD,
}; };
enum TStereoDeviceLibrary enum TStereoDeviceLibrary

62
code/nel/include/nel/3d/stereo_ng_hmd.h
View file

@ -1,62 +0,0 @@
/**
* \file stereo_ng_hmd.h
* \brief IStereoNGHMD
* \date 2014-04-01 10:53GMT
* \author Jan Boon (Kaetemi)
* IStereoNGHMD
*/
/*
* Copyright (C) 2014 by authors
*
* This file is part of NL3D.
* NL3D is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* NL3D is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
* Public License for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with NL3D. If not, see
* <http://www.gnu.org/licenses/>.
*/
#ifndef NL3D_STEREO_NG_HMD_H
#define NL3D_STEREO_NG_HMD_H
#include <nel/misc/types_nl.h>
// STL includes
// NeL includes
// Project includes
#include <nel/3d/stereo_hmd.h>
namespace NL3D {
/**
* \brief IStereoNGHMD
* \date 2014-04-01 10:53GMT
* \author Jan Boon (Kaetemi)
* IStereoNGHMD
*/
class IStereoNGHMD : public IStereoHMD
{
public:
IStereoNGHMD();
virtual ~IStereoNGHMD();
/// Kill the player
virtual void killUser() const = 0;
}; /* class IStereoNGHMD */
} /* namespace NL3D */
#endif /* #ifndef NL3D_STEREO_NG_HMD_H */
/* end of file */

2
code/nel/src/3d/CMakeLists.txt
View file

@ -697,8 +697,6 @@ SOURCE_GROUP(Stereo FILES
../../include/nel/3d/stereo_display.h ../../include/nel/3d/stereo_display.h
stereo_hmd.cpp stereo_hmd.cpp
../../include/nel/3d/stereo_hmd.h ../../include/nel/3d/stereo_hmd.h
stereo_ng_hmd.cpp
../../include/nel/3d/stereo_ng_hmd.h
stereo_ovr.cpp stereo_ovr.cpp
stereo_ovr_fp.cpp stereo_ovr_fp.cpp
../../include/nel/3d/stereo_ovr.h ../../include/nel/3d/stereo_ovr.h

211
code/nel/src/3d/driver/opengl/GL/glext.h
View file

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at ** used to make the header, and the header can be found at
** http://www.opengl.org/registry/ ** http://www.opengl.org/registry/
** **
** Khronos $Revision: 26007 $ on $Date: 2014-03-19 01:28:09 -0700 (Wed, 19 Mar 2014) $ ** Khronos $Revision: 26290 $ on $Date: 2014-04-16 05:35:38 -0700 (Wed, 16 Apr 2014) $
*/ */
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
@ -53,7 +53,7 @@ extern "C" {
#define GLAPI extern #define GLAPI extern
#endif #endif
#define GL_GLEXT_VERSION 20140319 #define GL_GLEXT_VERSION 20140416
/* Generated C header for: /* Generated C header for:
* API: gl * API: gl
@ -4804,6 +4804,109 @@ GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRG
#endif #endif
#endif /* GL_AMD_draw_buffers_blend */ #endif /* GL_AMD_draw_buffers_blend */
#ifndef GL_AMD_gpu_shader_int64
#define GL_AMD_gpu_shader_int64 1
typedef int64_t GLint64EXT;
#define GL_INT64_NV 0x140E
#define GL_UNSIGNED_INT64_NV 0x140F
#define GL_INT8_NV 0x8FE0
#define GL_INT8_VEC2_NV 0x8FE1
#define GL_INT8_VEC3_NV 0x8FE2
#define GL_INT8_VEC4_NV 0x8FE3
#define GL_INT16_NV 0x8FE4
#define GL_INT16_VEC2_NV 0x8FE5
#define GL_INT16_VEC3_NV 0x8FE6
#define GL_INT16_VEC4_NV 0x8FE7
#define GL_INT64_VEC2_NV 0x8FE9
#define GL_INT64_VEC3_NV 0x8FEA
#define GL_INT64_VEC4_NV 0x8FEB
#define GL_UNSIGNED_INT8_NV 0x8FEC
#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED
#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE
#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF
#define GL_UNSIGNED_INT16_NV 0x8FF0
#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1
#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2
#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3
#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5
#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6
#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7
#define GL_FLOAT16_NV 0x8FF8
#define GL_FLOAT16_VEC2_NV 0x8FF9
#define GL_FLOAT16_VEC3_NV 0x8FFA
#define GL_FLOAT16_VEC4_NV 0x8FFB
typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
#ifdef GL_GLEXT_PROTOTYPES
GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
#endif
#endif /* GL_AMD_gpu_shader_int64 */
#ifndef GL_AMD_interleaved_elements #ifndef GL_AMD_interleaved_elements
#define GL_AMD_interleaved_elements 1 #define GL_AMD_interleaved_elements 1
#define GL_VERTEX_ELEMENT_SWIZZLE_AMD 0x91A4 #define GL_VERTEX_ELEMENT_SWIZZLE_AMD 0x91A4
@ -4966,6 +5069,11 @@ GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value);
#define GL_AMD_transform_feedback3_lines_triangles 1 #define GL_AMD_transform_feedback3_lines_triangles 1
#endif /* GL_AMD_transform_feedback3_lines_triangles */ #endif /* GL_AMD_transform_feedback3_lines_triangles */
#ifndef GL_AMD_transform_feedback4
#define GL_AMD_transform_feedback4 1
#define GL_STREAM_RASTERIZATION_AMD 0x91A0
#endif /* GL_AMD_transform_feedback4 */
#ifndef GL_AMD_vertex_shader_layer #ifndef GL_AMD_vertex_shader_layer
#define GL_AMD_vertex_shader_layer 1 #define GL_AMD_vertex_shader_layer 1
#endif /* GL_AMD_vertex_shader_layer */ #endif /* GL_AMD_vertex_shader_layer */
@ -8722,103 +8830,6 @@ GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint
#ifndef GL_NV_gpu_shader5 #ifndef GL_NV_gpu_shader5
#define GL_NV_gpu_shader5 1 #define GL_NV_gpu_shader5 1
typedef int64_t GLint64EXT;
#define GL_INT64_NV 0x140E
#define GL_UNSIGNED_INT64_NV 0x140F
#define GL_INT8_NV 0x8FE0
#define GL_INT8_VEC2_NV 0x8FE1
#define GL_INT8_VEC3_NV 0x8FE2
#define GL_INT8_VEC4_NV 0x8FE3
#define GL_INT16_NV 0x8FE4
#define GL_INT16_VEC2_NV 0x8FE5
#define GL_INT16_VEC3_NV 0x8FE6
#define GL_INT16_VEC4_NV 0x8FE7
#define GL_INT64_VEC2_NV 0x8FE9
#define GL_INT64_VEC3_NV 0x8FEA
#define GL_INT64_VEC4_NV 0x8FEB
#define GL_UNSIGNED_INT8_NV 0x8FEC
#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED
#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE
#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF
#define GL_UNSIGNED_INT16_NV 0x8FF0
#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1
#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2
#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3
#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5
#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6
#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7
#define GL_FLOAT16_NV 0x8FF8
#define GL_FLOAT16_VEC2_NV 0x8FF9
#define GL_FLOAT16_VEC3_NV 0x8FFA
#define GL_FLOAT16_VEC4_NV 0x8FFB
typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
#ifdef GL_GLEXT_PROTOTYPES
GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
#endif
#endif /* GL_NV_gpu_shader5 */ #endif /* GL_NV_gpu_shader5 */
#ifndef GL_NV_half_float #ifndef GL_NV_half_float
@ -9402,7 +9413,6 @@ typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer,
typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result); typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value); typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value); typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
#ifdef GL_GLEXT_PROTOTYPES #ifdef GL_GLEXT_PROTOTYPES
@ -9417,7 +9427,6 @@ GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pnam
GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result); GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value); GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value); GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
#endif #endif

21
code/nel/src/3d/driver/opengl/GL/glxext.h
View file

@ -33,10 +33,10 @@ extern "C" {
** used to make the header, and the header can be found at ** used to make the header, and the header can be found at
** http://www.opengl.org/registry/ ** http://www.opengl.org/registry/
** **
** Khronos $Revision: 25923 $ on $Date: 2014-03-17 03:54:56 -0700 (Mon, 17 Mar 2014) $ ** Khronos $Revision: 26290 $ on $Date: 2014-04-16 05:35:38 -0700 (Wed, 16 Apr 2014) $
*/ */
#define GLX_GLXEXT_VERSION 20140317 #define GLX_GLXEXT_VERSION 20140416
/* Generated C header for: /* Generated C header for:
* API: glx * API: glx
@ -290,6 +290,23 @@ void glXFreeContextEXT (Display *dpy, GLXContext context);
#endif #endif
#endif /* GLX_EXT_import_context */ #endif /* GLX_EXT_import_context */
#ifndef GLX_EXT_stereo_tree
#define GLX_EXT_stereo_tree 1
typedef struct {
int type;
unsigned long serial;
Bool send_event;
Display *display;
int extension;
int evtype;
GLXDrawable window;
Bool stereo_tree;
} GLXStereoNotifyEventEXT;
#define GLX_STEREO_TREE_EXT 0x20F5
#define GLX_STEREO_NOTIFY_MASK_EXT 0x00000001
#define GLX_STEREO_NOTIFY_EXT 0x00000000
#endif /* GLX_EXT_stereo_tree */
#ifndef GLX_EXT_swap_control #ifndef GLX_EXT_swap_control
#define GLX_EXT_swap_control 1 #define GLX_EXT_swap_control 1
#define GLX_SWAP_INTERVAL_EXT 0x20F1 #define GLX_SWAP_INTERVAL_EXT 0x20F1

4
code/nel/src/3d/driver/opengl/GL/wglext.h
View file

@ -33,7 +33,7 @@ extern "C" {
** used to make the header, and the header can be found at ** used to make the header, and the header can be found at
** http://www.opengl.org/registry/ ** http://www.opengl.org/registry/
** **
** Khronos $Revision: 25923 $ on $Date: 2014-03-17 03:54:56 -0700 (Mon, 17 Mar 2014) $ ** Khronos $Revision: 26290 $ on $Date: 2014-04-16 05:35:38 -0700 (Wed, 16 Apr 2014) $
*/ */
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
@ -41,7 +41,7 @@ extern "C" {
#include <windows.h> #include <windows.h>
#endif #endif
#define WGL_WGLEXT_VERSION 20140317 #define WGL_WGLEXT_VERSION 20140416
/* Generated C header for: /* Generated C header for:
* API: wgl * API: wgl

6
code/nel/src/3d/driver/opengl/GLES/glext.h
View file

@ -1,7 +1,7 @@
#ifndef __glext_h_ #ifndef __glext_h_
#define __glext_h_ #define __glext_h_
/* $Revision: 19260 $ on $Date:: 2012-09-20 11:30:36 -0700 #$ */ /* $Revision: 20798 $ on $Date:: 2013-03-07 01:19:34 -0800 #$ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -1055,10 +1055,10 @@ typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum
#ifndef GL_EXT_multi_draw_arrays #ifndef GL_EXT_multi_draw_arrays
#define GL_EXT_multi_draw_arrays 1 #define GL_EXT_multi_draw_arrays 1
#ifdef GL_GLEXT_PROTOTYPES #ifdef GL_GLEXT_PROTOTYPES
GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum, const GLint *, const GLsizei *, GLsizei);
GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
#endif /* GL_GLEXT_PROTOTYPES */ #endif /* GL_GLEXT_PROTOTYPES */
typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
#endif #endif

54
code/nel/src/3d/driver/opengl/KHR/khrplatform.h
View file

@ -26,7 +26,7 @@
/* Khronos platform-specific types and definitions. /* Khronos platform-specific types and definitions.
* *
* $Revision: 1.5 $ on $Date: 2010/06/03 16:51:55 $ * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
* *
* Adopters may modify this file to suit their platform. Adopters are * Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos * encouraged to submit platform specific modifications to the Khronos
@ -97,19 +97,10 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
* This precedes the return type of the function in the function prototype. * This precedes the return type of the function in the function prototype.
*/ */
#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
#if (defined(_WIN32) || defined(__VC32__)) && !defined(__SCITECH_SNAP__) && !defined(__WINSCW__)
# if defined (_DLL_EXPORTS)
# define KHRONOS_APICALL __declspec(dllexport)
# else
# define KHRONOS_APICALL __declspec(dllimport) # define KHRONOS_APICALL __declspec(dllimport)
# endif
#elif defined (__SYMBIAN32__) #elif defined (__SYMBIAN32__)
# if defined (__GCC32__)
# define KHRONOS_APICALL __declspec(dllexport)
# else
# define KHRONOS_APICALL IMPORT_C # define KHRONOS_APICALL IMPORT_C
# endif
#else #else
# define KHRONOS_APICALL # define KHRONOS_APICALL
#endif #endif
@ -120,7 +111,7 @@
* This follows the return type of the function and precedes the function * This follows the return type of the function and precedes the function
* name in the function prototype. * name in the function prototype.
*/ */
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) && !defined(__WINSCW__) #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
/* Win32 but not WinCE */ /* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall # define KHRONOS_APIENTRY __stdcall
#else #else
@ -141,18 +132,7 @@
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* basic type definitions * basic type definitions
*-----------------------------------------------------------------------*/ *-----------------------------------------------------------------------*/
#if defined(__SYMBIAN32__) #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
#include <e32def.h>
typedef TInt32 khronos_int32_t;
typedef TUint32 khronos_uint32_t;
typedef TInt64 khronos_int64_t;
typedef TUint64 khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
/* /*
@ -208,19 +188,6 @@ typedef unsigned long long int khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1 #define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1 #define KHRONOS_SUPPORT_FLOAT 1
#elif defined(_UITRON_)
/*
* uITRON
*/
typedef signed int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
typedef long long khronos_int64_t;
typedef unsigned long long khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif 0 #elif 0
/* /*
@ -254,10 +221,23 @@ typedef signed char khronos_int8_t;
typedef unsigned char khronos_uint8_t; typedef unsigned char khronos_uint8_t;
typedef signed short int khronos_int16_t; typedef signed short int khronos_int16_t;
typedef unsigned short int khronos_uint16_t; typedef unsigned short int khronos_uint16_t;
/*
* Types that differ between LLP64 and LP64 architectures - in LLP64,
* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
* to be the only LLP64 architecture in current use.
*/
#ifdef _WIN64
typedef signed long long int khronos_intptr_t;
typedef unsigned long long int khronos_uintptr_t;
typedef signed long long int khronos_ssize_t;
typedef unsigned long long int khronos_usize_t;
#else
typedef signed long int khronos_intptr_t; typedef signed long int khronos_intptr_t;
typedef unsigned long int khronos_uintptr_t; typedef unsigned long int khronos_uintptr_t;
typedef signed long int khronos_ssize_t; typedef signed long int khronos_ssize_t;
typedef unsigned long int khronos_usize_t; typedef unsigned long int khronos_usize_t;
#endif
#if KHRONOS_SUPPORT_FLOAT #if KHRONOS_SUPPORT_FLOAT
/* /*

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

@ -2195,7 +2195,7 @@ void CDriverGL::setSwapVBLInterval(uint interval)
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
if (_win && _Extensions.GLXEXTSwapControl) if (_win && _Extensions.GLXEXTSwapControl)
{ {
res = nglXSwapIntervalEXT(_dpy, _win, interval) == 0; nglXSwapIntervalEXT(_dpy, _win, interval);
} }
else if (_Extensions.GLXSGISwapControl) else if (_Extensions.GLXSGISwapControl)
{ {
@ -2513,9 +2513,7 @@ void CDriverGL::retrieveATIDriverVersion()
RegCloseKey(parentKey); RegCloseKey(parentKey);
} }
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
# warning "OpenGL Driver: Missing Mac Implementation for ATI version retrieval" // TODO: Missing Mac Implementation for ATI version retrieval
nlwarning("OpenGL Driver: Missing Mac Implementation for ATI version retrieval");
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
// TODO for Linux: implement retrieveATIDriverVersion... assuming versions under linux are probably different // TODO for Linux: implement retrieveATIDriverVersion... assuming versions under linux are probably different
#endif #endif

4
code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
View file

@ -799,9 +799,7 @@ uint CDriverGL::getDoubleClickDelay(bool hardwareMouse)
} }
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
# warning "OpenGL Driver: Missing Mac Implementation for getDoubleClickDelay" // TODO: Missing Mac Implementation for getDoubleClickDelay
nlwarning("OpenGL Driver: Missing Mac Implementation for getDoubleClickDelay");
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
// TODO for Linux // TODO for Linux

5
code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp
View file

@ -70,13 +70,16 @@ CPixelProgamDrvInfosGL::CPixelProgamDrvInfosGL (CDriverGL *drv, ItGPUPrgDrvInfoP
bool CDriverGL::supportPixelProgram(CPixelProgram::TProfile profile) const bool CDriverGL::supportPixelProgram(CPixelProgram::TProfile profile) const
{ {
H_AUTO_OGL(CPixelProgamDrvInfosGL_supportPixelProgram_profile) H_AUTO_OGL(CPixelProgamDrvInfosGL_supportPixelProgram_profile);
switch (profile) switch (profile)
{ {
case CPixelProgram::arbfp1: case CPixelProgram::arbfp1:
return _Extensions.ARBFragmentProgram; return _Extensions.ARBFragmentProgram;
case CPixelProgram::fp40: case CPixelProgram::fp40:
return _Extensions.NVFragmentProgram2; return _Extensions.NVFragmentProgram2;
default:
break;
} }
return false; return false;
} }

4
code/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp
View file

@ -60,6 +60,8 @@ inline void CDriverGL::setUniform4fInl(TProgram program, uint index, float f0, f
nglProgramEnvParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, index, f0, f1, f2, f3); nglProgramEnvParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, index, f0, f1, f2, f3);
} }
break; break;
default:
break;
} }
#endif #endif
} }
@ -100,6 +102,8 @@ inline void CDriverGL::setUniform4fvInl(TProgram program, uint index, size_t num
} }
} }
break; break;
default:
break;
} }
#endif #endif
} }

4
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -2347,7 +2347,7 @@ void CDriverGL::showWindow(bool show)
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
# warning "OpenGL Driver: Missing Mac Implementation for showWindow" // TODO: Missing Mac Implementation for showWindow
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
@ -2771,7 +2771,7 @@ bool CDriverGL::isActive()
res = (IsWindow(_win) != FALSE); res = (IsWindow(_win) != FALSE);
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
# warning "OpenGL Driver: Missing Mac Implementation for isActive (always true if a window is set)" // TODO: Missing Mac Implementation for isActive (always true if a window is set)
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
// check if our window is still active // check if our window is still active

55
code/nel/src/3d/stereo_ng_hmd.cpp
View file

@ -1,55 +0,0 @@
/**
* \file stereo_hmd.cpp
* \brief IStereoNGHMD
* \date 2014-04-01 10:53GMT
* \author Jan Boon (Kaetemi)
* IStereoNGHMD
*/
/*
* Copyright (C) 2014 by authors
*
* This file is part of NL3D.
* NL3D is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* NL3D is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
* Public License for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with NL3D. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include <nel/misc/types_nl.h>
#include <nel/3d/stereo_ng_hmd.h>
// STL includes
// NeL includes
// #include <nel/misc/debug.h>
// Project includes
using namespace std;
// using namespace NLMISC;
namespace NL3D {
IStereoNGHMD::IStereoNGHMD()
{
}
IStereoNGHMD::~IStereoNGHMD()
{
}
} /* namespace NL3D */
/* end of file */

3
code/nel/src/gui/ctrl_base.cpp
View file

@ -81,6 +81,9 @@ namespace NLGUI
case TTSpecialWindow: case TTSpecialWindow:
return "special"; return "special";
break; break;
default:
break;
} }
return ""; return "";

3
code/nel/src/gui/ctrl_base_button.cpp
View file

@ -795,7 +795,10 @@ namespace NLGUI
return "radio_button"; return "radio_button";
break; break;
default:
break;
} }
return ""; return "";
} }

4
code/nel/src/gui/ctrl_col_pick.cpp
View file

@ -205,12 +205,12 @@ namespace NLGUI
CViewRenderer &rVR = *CViewRenderer::getInstance(); CViewRenderer &rVR = *CViewRenderer::getInstance();
if(prop) if(prop)
{ {
string sTmp = NLMISC::strlwr((const char*)prop); string sTmp = NLMISC::toLower((const char*)prop);
_Texture = rVR.createTexture (sTmp, 0, 0, 256, 64, false, false); _Texture = rVR.createTexture (sTmp, 0, 0, 256, 64, false, false);
} }
prop = (char*) xmlGetProp( node, (xmlChar*)"onchange" ); prop = (char*) xmlGetProp( node, (xmlChar*)"onchange" );
if (prop) _AHOnChange = NLMISC::strlwr(prop); if (prop) _AHOnChange = NLMISC::toLower((const char*)prop);
prop = (char*) xmlGetProp( node, (xmlChar*)"onchange_params" ); prop = (char*) xmlGetProp( node, (xmlChar*)"onchange_params" );
if (prop) _AHOnChangeParams = string((const char*)prop); if (prop) _AHOnChangeParams = string((const char*)prop);

6
code/nel/src/gui/group_editbox.cpp
View file

@ -208,6 +208,9 @@ namespace NLGUI
case PlayerName: case PlayerName:
return "playername"; return "playername";
break; break;
default:
break;
} }
return "text"; return "text";
@ -497,6 +500,9 @@ namespace NLGUI
case PlayerName: case PlayerName:
e = "playername"; e = "playername";
break; break;
default:
break;
} }
xmlSetProp( node, BAD_CAST "enter_type", BAD_CAST e.c_str() ); xmlSetProp( node, BAD_CAST "enter_type", BAD_CAST e.c_str() );

52
code/nel/src/gui/group_list.cpp
View file

@ -199,77 +199,77 @@ namespace NLGUI
{ {
return toString( _MaxElements ); return toString( _MaxElements );
} }
else
if( name == "addelt" ) if( name == "addelt" )
{ {
switch( _AddElt ) switch( _AddElt )
{ {
case Top: case Top:
return "T"; return "T";
break;
case Left: case Left:
return "L"; return "L";
break;
case Right: case Right:
return "R"; return "R";
break;
}
case Bottom:
return "B"; return "B";
} }
else
nlassert(false);
}
if( name == "align" ) if( name == "align" )
{ {
switch( _Align ) switch( _Align )
{ {
case Top: case Top:
return "T"; return "T";
break;
case Left: case Left:
return "L"; return "L";
break;
case Right: case Right:
return "R"; return "R";
break;
}
case Bottom:
return "B"; return "B";
} }
else
nlassert(false);
}
if( name == "space" ) if( name == "space" )
{ {
return toString( _Space ); return toString( _Space );
} }
else
if( name == "over" ) if( name == "over" )
{ {
return toString( _Over ); return toString( _Over );
} }
else
if( name == "dynamic_display_size" ) if( name == "dynamic_display_size" )
{ {
return toString( _DynamicDisplaySize ); return toString( _DynamicDisplaySize );
} }
else
if( name == "col_over" ) if( name == "col_over" )
{ {
return toString( _OverColor ); return toString( _OverColor );
} }
else
if( name == "hardtext" ) if( name == "hardtext" )
{ {
return _HardText; return _HardText;
} }
else
if( name == "textid" ) if( name == "textid" )
{ {
return toString( _TextId ); return toString( _TextId );
} }
else
return CInterfaceGroup::getProperty( name ); return CInterfaceGroup::getProperty( name );
} }
@ -282,7 +282,7 @@ namespace NLGUI
_MaxElements = i; _MaxElements = i;
return; return;
} }
else
if( name == "addelt" ) if( name == "addelt" )
{ {
if( value == "T" ) if( value == "T" )
@ -300,7 +300,7 @@ namespace NLGUI
setupSizes(); setupSizes();
return; return;
} }
else
if( name == "align" ) if( name == "align" )
{ {
if( value == "T" ) if( value == "T" )
@ -317,7 +317,7 @@ namespace NLGUI
return; return;
} }
else
if( name == "space" ) if( name == "space" )
{ {
sint32 i; sint32 i;
@ -325,7 +325,7 @@ namespace NLGUI
_Space = i; _Space = i;
return; return;
} }
else
if( name == "over" ) if( name == "over" )
{ {
bool b; bool b;
@ -333,7 +333,7 @@ namespace NLGUI
_Over = b; _Over = b;
return; return;
} }
else
if( name == "dynamic_display_size" ) if( name == "dynamic_display_size" )
{ {
bool b; bool b;
@ -341,7 +341,7 @@ namespace NLGUI
_DynamicDisplaySize = b; _DynamicDisplaySize = b;
return; return;
} }
else
if( name == "col_over" ) if( name == "col_over" )
{ {
CRGBA c; CRGBA c;
@ -349,7 +349,7 @@ namespace NLGUI
_OverColor = c; _OverColor = c;
return; return;
} }
else
if( name == "hardtext" ) if( name == "hardtext" )
{ {
_HardText = value; _HardText = value;
@ -357,7 +357,7 @@ namespace NLGUI
onTextChanged(); onTextChanged();
return; return;
} }
else
if( name == "textid" ) if( name == "textid" )
{ {
uint32 i; uint32 i;
@ -367,7 +367,7 @@ namespace NLGUI
onTextChanged(); onTextChanged();
return; return;
} }
else
CInterfaceGroup::setProperty( name, value ); CInterfaceGroup::setProperty( name, value );
} }

16
code/nel/src/gui/group_paragraph.cpp
View file

@ -197,18 +197,18 @@ namespace NLGUI
{ {
case Top: case Top:
return "T"; return "T";
break;
case Left: case Left:
return "L"; return "L";
break;
case Right: case Right:
return "R"; return "R";
break;
case Bottom:
return "B";
} }
return "B"; nlassert(false);
} }
else else
if( name == "align" ) if( name == "align" )
@ -217,18 +217,18 @@ namespace NLGUI
{ {
case Top: case Top:
return "T"; return "T";
break;
case Left: case Left:
return "L"; return "L";
break;
case Right: case Right:
return "R"; return "R";
break;
case Bottom:
return "B";
} }
return "B"; nlassert(false);
} }
else else
if( name == "space" ) if( name == "space" )

15
code/nel/src/gui/group_table.cpp
View file

@ -80,15 +80,15 @@ namespace NLGUI
{ {
case Right: case Right:
return "right"; return "right";
break;
case Center: case Center:
return "center"; return "center";
break;
case Left:
return "left";
} }
return "left"; nlassert(false);
} }
else else
if( name == "valign" ) if( name == "valign" )
@ -97,14 +97,15 @@ namespace NLGUI
{ {
case Middle: case Middle:
return "middle"; return "middle";
break;
case Bottom: case Bottom:
return "bottom"; return "bottom";
break;
case Top:
return "top";
} }
return "top"; nlassert(false);
} }
else else
if( name == "left_margin" ) if( name == "left_margin" )

3
code/nel/src/gui/interface_element.cpp
View file

@ -1001,8 +1001,7 @@ namespace NLGUI
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
bool CInterfaceElement::convertBool (const char *ptr) bool CInterfaceElement::convertBool (const char *ptr)
{ {
std::string str = ptr; std::string str = toLower(ptr);
NLMISC::strlwr( str );
bool b = false; bool b = false;
fromString( str, b ); fromString( str, b );
return b; return b;

4
code/nel/src/gui/view_bitmap.cpp
View file

@ -307,8 +307,7 @@ namespace NLGUI
prop = (char*) xmlGetProp( cur, (xmlChar*)"texture" ); prop = (char*) xmlGetProp( cur, (xmlChar*)"texture" );
if (prop) if (prop)
{ {
string TxName = (const char *) prop; string TxName = toLower((const char *) prop);
TxName = strlwr (TxName);
setTexture (TxName); setTexture (TxName);
//CInterfaceManager *pIM = CInterfaceManager::getInstance(); //CInterfaceManager *pIM = CInterfaceManager::getInstance();
//CViewRenderer &rVR = *CViewRenderer::getInstance(); //CViewRenderer &rVR = *CViewRenderer::getInstance();
@ -450,7 +449,6 @@ namespace NLGUI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void CViewBitmap::setTexture(const std::string & TxName) void CViewBitmap::setTexture(const std::string & TxName)
{ {
_TextureId.setTexture (TxName.c_str (), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false); _TextureId.setTexture (TxName.c_str (), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false);
} }

4
code/nel/src/gui/view_renderer.cpp
View file

@ -894,11 +894,11 @@ namespace NLGUI
{ {
if (sGlobalTextureName.empty()) return -1; if (sGlobalTextureName.empty()) return -1;
// Look if already existing // Look if already existing
string sLwrGTName = strlwr(sGlobalTextureName); string sLwrGTName = toLower(sGlobalTextureName);
TGlobalTextureList::iterator ite = _GlobalTextures.begin(); TGlobalTextureList::iterator ite = _GlobalTextures.begin();
while (ite != _GlobalTextures.end()) while (ite != _GlobalTextures.end())
{ {
std::string sText = strlwr(ite->Name); std::string sText = toLower(ite->Name);
if (sText == sLwrGTName) if (sText == sLwrGTName)
break; break;
ite++; ite++;

14
code/ryzom/client/src/character_cl.cpp
View file

@ -2292,23 +2292,23 @@ void CCharacterCL::endAnimTransition()
if(_CurrentState->NextMode != _Mode) if(_CurrentState->NextMode != _Mode)
{ {
// Undo previous behaviour // Undo previous behaviour
switch(_Mode) if (_Mode == MBEHAV::DEATH)
{ {
case MBEHAV::DEATH:
// Restore collisions. // Restore collisions.
if(_Primitive) if (_Primitive)
{ {
// TODO: Without this dynamic cast // TODO: Without this dynamic cast
if(dynamic_cast<CPlayerCL *>(this)) if (dynamic_cast<CPlayerCL *>(this))
_Primitive->setOcclusionMask(MaskColPlayer); _Primitive->setOcclusionMask(MaskColPlayer);
else else
_Primitive->setOcclusionMask(MaskColNpc); _Primitive->setOcclusionMask(MaskColNpc);
} }
break;
} }
if(ClientCfg.UsePACSForAll && _Primitive)
if (ClientCfg.UsePACSForAll && _Primitive)
_Primitive->setCollisionMask(MaskColNone); _Primitive->setCollisionMask(MaskColNone);
//// AJOUT ////
//// ADDED ////
switch(_CurrentState->NextMode) switch(_CurrentState->NextMode)
{ {
// Combat // Combat

20
code/ryzom/client/src/client_cfg.cpp
View file

@ -846,6 +846,7 @@ void CClientConfig::setValues()
if (nlstricmp(varPtr->asString(), "Auto") == 0 || nlstricmp(varPtr->asString(), "0") == 0) ClientCfg.Driver3D = CClientConfig::DrvAuto; if (nlstricmp(varPtr->asString(), "Auto") == 0 || nlstricmp(varPtr->asString(), "0") == 0) ClientCfg.Driver3D = CClientConfig::DrvAuto;
else if (nlstricmp(varPtr->asString(), "OpenGL") == 0 || nlstricmp(varPtr->asString(), "1") == 0) ClientCfg.Driver3D = CClientConfig::OpenGL; else if (nlstricmp(varPtr->asString(), "OpenGL") == 0 || nlstricmp(varPtr->asString(), "1") == 0) ClientCfg.Driver3D = CClientConfig::OpenGL;
else if (nlstricmp(varPtr->asString(), "Direct3D") == 0 || nlstricmp(varPtr->asString(), "2") == 0) ClientCfg.Driver3D = CClientConfig::Direct3D; else if (nlstricmp(varPtr->asString(), "Direct3D") == 0 || nlstricmp(varPtr->asString(), "2") == 0) ClientCfg.Driver3D = CClientConfig::Direct3D;
else if (nlstricmp(varPtr->asString(), "OpenGLES") == 0 || nlstricmp(varPtr->asString(), "3") == 0) ClientCfg.Driver3D = CClientConfig::OpenGLES;
} }
else else
cfgWarning ("Default value used for 'Driver3D' !!!"); cfgWarning ("Default value used for 'Driver3D' !!!");
@ -1075,7 +1076,7 @@ void CClientConfig::setValues()
// NEW PATCHLET SYSTEM // // NEW PATCHLET SYSTEM //
READ_STRING_FV(PatchletUrl) READ_STRING_FV(PatchletUrl)
//////////////////////// ///////////
// WEBIG // // WEBIG //
READ_STRING_FV(WebIgMainDomain); READ_STRING_FV(WebIgMainDomain);
READ_STRINGVECTOR_FV(WebIgTrustedDomains); READ_STRINGVECTOR_FV(WebIgTrustedDomains);
@ -1726,10 +1727,7 @@ void CClientConfig::setValues()
} }
// Initialize the camera distance (after camera dist max) // Initialize the camera distance (after camera dist max)
if (!ClientCfg.FPV) View.setCameraDistanceMaxForPlayer();
{
View.cameraDistance(ClientCfg.CameraDistance);
}
// draw in client light? // draw in client light?
if(ClientCfg.Light) if(ClientCfg.Light)
@ -2213,28 +2211,24 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
std::string defaultConfigFileName = "client_default.cfg"; std::string defaultConfigFileName = "client_default.cfg";
std::string defaultConfigPath; std::string defaultConfigPath;
p_name = std::string(); p_name.clear();
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
// on mac, client_default.cfg should be searched in .app/Contents/Resources/ // on mac, client_default.cfg should be searched in .app/Contents/Resources/
defaultConfigPath = defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
#elif defined(RYZOM_ETC_PREFIX) #elif defined(RYZOM_ETC_PREFIX)
// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there // if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX); defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX);
#else #else
// some other prefix here :) // some other prefix here :)
#endif // RYZOM_ETC_PREFIX #endif // RYZOM_ETC_PREFIX
// look in the current working directory first // look in the current working directory first
if(CFile::isExists(defaultConfigFileName)) if (CFile::isExists(defaultConfigFileName))
p_name = defaultConfigFileName; p_name = defaultConfigFileName;
// if not in working directory, check using prefix path // if not in working directory, check using prefix path
else if(CFile::isExists(defaultConfigPath + defaultConfigFileName)) else if (CFile::isExists(defaultConfigPath + defaultConfigFileName))
p_name = defaultConfigPath + defaultConfigFileName; p_name = defaultConfigPath + defaultConfigFileName;
// if some client_default.cfg was found return true // if some client_default.cfg was found return true

3
code/ryzom/client/src/client_sheets/sbrick_sheet.cpp
View file

@ -312,8 +312,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root)
BrickRequiredFlags= 0; BrickRequiredFlags= 0;
for(i=0;i<Properties.size();i++) for(i=0;i<Properties.size();i++)
{ {
string text= Properties[i].Text; string text= NLMISC::toLower(Properties[i].Text);
strlwr(text);
// If the property is an opening property // If the property is an opening property
const string openingProp[]= { "opening_1:", "opening_2:", "opening_3:" }; const string openingProp[]= { "opening_1:", "opening_2:", "opening_3:" };

3
code/ryzom/client/src/global.cpp
View file

@ -28,7 +28,6 @@ using namespace NLMISC;
NL3D::UDriver *Driver = 0; // The main 3D Driver NL3D::UDriver *Driver = 0; // The main 3D Driver
NL3D::IStereoDisplay *StereoDisplay = NULL; // Stereo display NL3D::IStereoDisplay *StereoDisplay = NULL; // Stereo display
NL3D::IStereoHMD *StereoHMD = NULL; // Head mount display NL3D::IStereoHMD *StereoHMD = NULL; // Head mount display
NL3D::IStereoNGHMD *StereoNGHMD = NULL; // HMD with player death support
CSoundManager *SoundMngr = 0; // the sound manager CSoundManager *SoundMngr = 0; // the sound manager
NL3D::UMaterial GenericMat; // Generic Material NL3D::UMaterial GenericMat; // Generic Material
NL3D::UTextContext *TextContext = 0; // Context for all the text in the client. NL3D::UTextContext *TextContext = 0; // Context for all the text in the client.
@ -69,8 +68,6 @@ bool PermanentlyBanned = false;
bool IgnoreEntityDbUpdates = false; bool IgnoreEntityDbUpdates = false;
bool FreeTrial = false; bool FreeTrial = false;
bool NoLogout = false;
std::vector<std::pair< std::vector<std::pair<
std::string, std::string> > VRDeviceCache; std::string, std::string> > VRDeviceCache;

4
code/ryzom/client/src/global.h
View file

@ -42,7 +42,6 @@ namespace NL3D
class UWaterEnvMap; class UWaterEnvMap;
class IStereoDisplay; class IStereoDisplay;
class IStereoHMD; class IStereoHMD;
class IStereoNGHMD;
} }
class CEntityAnimationManager; class CEntityAnimationManager;
@ -82,7 +81,6 @@ const float ExtraZoneLoadingVision = 100.f;
extern NL3D::UDriver *Driver; // The main 3D Driver extern NL3D::UDriver *Driver; // The main 3D Driver
extern NL3D::IStereoDisplay *StereoDisplay; // Stereo display extern NL3D::IStereoDisplay *StereoDisplay; // Stereo display
extern NL3D::IStereoHMD *StereoHMD; // Head mount display extern NL3D::IStereoHMD *StereoHMD; // Head mount display
extern NL3D::IStereoNGHMD *StereoNGHMD; // HMD with player death support
extern CSoundManager *SoundMngr; // the sound manager extern CSoundManager *SoundMngr; // the sound manager
extern NL3D::UMaterial GenericMat; // Generic Material extern NL3D::UMaterial GenericMat; // Generic Material
extern NL3D::UTextContext *TextContext; // Context for all the text in the client. extern NL3D::UTextContext *TextContext; // Context for all the text in the client.
@ -130,8 +128,6 @@ extern std::string Cookie, FSAddr;
extern std::string RingMainURL; extern std::string RingMainURL;
extern bool FreeTrial; extern bool FreeTrial;
extern bool NoLogout;
void resetTextContext (const char *font, bool resetInterfaceManager); void resetTextContext (const char *font, bool resetInterfaceManager);
#endif // CL_GLOBAL_H #endif // CL_GLOBAL_H

8
code/ryzom/client/src/init.cpp
View file

@ -40,7 +40,6 @@
#include "nel/3d/u_text_context.h" #include "nel/3d/u_text_context.h"
#include "nel/3d/u_shape_bank.h" #include "nel/3d/u_shape_bank.h"
#include "nel/3d/stereo_hmd.h" #include "nel/3d/stereo_hmd.h"
#include "nel/3d/stereo_ng_hmd.h"
// Net. // Net.
#include "nel/net/email.h" #include "nel/net/email.h"
// Ligo. // Ligo.
@ -640,15 +639,10 @@ void initStereoDisplayDevice()
StereoDisplay = IStereoDisplay::createDevice(*deviceInfo); StereoDisplay = IStereoDisplay::createDevice(*deviceInfo);
if (StereoDisplay) if (StereoDisplay)
{ {
if (deviceInfo->Class == CStereoDeviceInfo::StereoHMD if (deviceInfo->Class == CStereoDeviceInfo::StereoHMD)
|| deviceInfo->Class == CStereoDeviceInfo::StereoNGHMD)
{ {
nlinfo("VR [C]: Stereo display device is a HMD"); nlinfo("VR [C]: Stereo display device is a HMD");
StereoHMD = static_cast<IStereoHMD *>(StereoDisplay); StereoHMD = static_cast<IStereoHMD *>(StereoDisplay);
if (deviceInfo->Class == CStereoDeviceInfo::StereoNGHMD)
{
StereoNGHMD = static_cast<IStereoNGHMD *>(StereoDisplay);
}
} }
if (Driver) // VR_DRIVER if (Driver) // VR_DRIVER
{ {

2
code/ryzom/client/src/init_main_loop.cpp
View file

@ -148,7 +148,7 @@ bool UseEscapeDuringLoading = USE_ESCAPE_DURING_LOADING;
#define ENTITY_TEXTURE_COARSE_LEVEL 3 #define ENTITY_TEXTURE_COARSE_LEVEL 3
#define ENTITY_TEXTURE_NORMAL_LEVEL 1 #define ENTITY_TEXTURE_NORMAL_LEVEL 1
#define ENTITY_TEXTURE_HIGH_LEVEL 0 #define ENTITY_TEXTURE_HIGH_LEVEL 0
// Size in Mo of the cache for entity texturing. // Size in MB of the cache for entity texturing.
#define ENTITY_TEXTURE_NORMAL_MEMORY 10 #define ENTITY_TEXTURE_NORMAL_MEMORY 10
#define ENTITY_TEXTURE_HIGH_MEMORY 40 #define ENTITY_TEXTURE_HIGH_MEMORY 40

34
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -727,16 +727,6 @@ void CInterfaceManager::initOutGame()
//NLMEMORY::CheckHeap (true); //NLMEMORY::CheckHeap (true);
// Initialize the web browser
{
CGroupHTML *pGH = dynamic_cast<CGroupHTML*>( CWidgetManager::getInstance()->getElementFromId(GROUP_BROWSER));
if (pGH)
{
pGH->setActive(true);
pGH->browse(ClientCfg.PatchletUrl.c_str());
}
}
if (ClientCfg.XMLOutGameInterfaceFiles.size()==0) if (ClientCfg.XMLOutGameInterfaceFiles.size()==0)
{ {
@ -777,6 +767,17 @@ void CInterfaceManager::initOutGame()
initActions(); initActions();
} }
//NLMEMORY::CheckHeap (true); //NLMEMORY::CheckHeap (true);
// Initialize the web browser
{
CGroupHTML *pGH = dynamic_cast<CGroupHTML*>( CWidgetManager::getInstance()->getElementFromId(GROUP_BROWSER));
if (pGH)
{
pGH->setActive(true);
pGH->browse(ClientCfg.PatchletUrl.c_str());
}
}
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -1089,7 +1090,6 @@ void CInterfaceManager::configureQuitDialogBox()
// Show Launch Editor if not in editor mode // Show Launch Editor if not in editor mode
CInterfaceElement *eltCancel = quitDlg->getElement(quitDialogStr+":cancel"); CInterfaceElement *eltCancel = quitDlg->getElement(quitDialogStr+":cancel");
CInterfaceElement *eltEdit = quitDlg->getElement(quitDialogStr+":launch_editor"); CInterfaceElement *eltEdit = quitDlg->getElement(quitDialogStr+":launch_editor");
if (eltEdit) if (eltEdit)
{ {
if (UserRoleInSession != R2::TUserRole::ur_editor && !sessionOwner) if (UserRoleInSession != R2::TUserRole::ur_editor && !sessionOwner)
@ -1160,18 +1160,6 @@ void CInterfaceManager::configureQuitDialogBox()
eltQuitNow->setActive(false); eltQuitNow->setActive(false);
} }
} }
if (NoLogout)
{
eltEdit->setY(0);
eltEdit->setActive(false);
eltQuit->setY(0);
eltQuit->setActive(false);
eltQuitNow->setY(0);
eltQuitNow->setActive(false);
eltRet->setY(0);
eltRet->setActive(false);
}
} }
// Make all controls have the same size // Make all controls have the same size

7
code/ryzom/client/src/motion/modes/death_mode.cpp
View file

@ -21,9 +21,6 @@
// INCLUDES // // INCLUDES //
////////////// //////////////
#include "stdpch.h" #include "stdpch.h"
#include "nel/3d/stereo_ng_hmd.h"
// Client. // Client.
#include "../../input.h" #include "../../input.h"
#include "../user_controls.h" #include "../user_controls.h"
@ -31,7 +28,6 @@
#include "../../view.h" #include "../../view.h"
#include "../../interface_v3/interface_manager.h" #include "../../interface_v3/interface_manager.h"
#include "../../entities.h" #include "../../entities.h"
#include "global.h"
/////////// ///////////
@ -65,9 +61,6 @@ void CUserControls::deathModeStart()
_InternalView = false; _InternalView = false;
// Show/hide all or parts of the user body (after _InternaView is set). // Show/hide all or parts of the user body (after _InternaView is set).
UserEntity->updateVisualDisplay(); UserEntity->updateVisualDisplay();
// Kill the player
if (StereoNGHMD)
StereoNGHMD->killUser();
}// deathModeStart // }// deathModeStart //
//----------------------------------------------- //-----------------------------------------------

9
code/ryzom/client/src/net_manager.cpp
View file

@ -3555,13 +3555,6 @@ void impulseSetNpcIconTimer(NLMISC::CBitMemStream &impulse)
CNPCIconCache::getInstance().setMissionGiverTimer(delay); CNPCIconCache::getInstance().setMissionGiverTimer(delay);
} }
void impulseEventDisableLogoutButton(NLMISC::CBitMemStream &impulse)
{
NoLogout = true;
CInterfaceManager *im = CInterfaceManager::getInstance();
im->configureQuitDialogBox();
}
//----------------------------------------------- //-----------------------------------------------
// initializeNetwork : // initializeNetwork :
//----------------------------------------------- //-----------------------------------------------
@ -3711,8 +3704,6 @@ void initializeNetwork()
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_DESC", impulseSetNpcIconDesc ); GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_DESC", impulseSetNpcIconDesc );
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SVR_EVENT_MIS_AVL", impulseServerEventForMissionAvailability ); GenericMsgHeaderMngr.setCallback( "NPC_ICON:SVR_EVENT_MIS_AVL", impulseServerEventForMissionAvailability );
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_TIMER", impulseSetNpcIconTimer ); GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_TIMER", impulseSetNpcIconTimer );
GenericMsgHeaderMngr.setCallback( "EVENT:DISABLE_LOGOUT_BUTTON", impulseEventDisableLogoutButton );
} }

5
code/ryzom/client/src/release.cpp
View file

@ -36,7 +36,6 @@
#include "nel/3d/u_visual_collision_manager.h" #include "nel/3d/u_visual_collision_manager.h"
#include "nel/3d/u_shape_bank.h" #include "nel/3d/u_shape_bank.h"
#include "nel/3d/stereo_hmd.h" #include "nel/3d/stereo_hmd.h"
#include "nel/3d/stereo_ng_hmd.h"
// Client // Client
#include "global.h" #include "global.h"
#include "release.h" #include "release.h"
@ -517,13 +516,9 @@ void releaseStereoDisplayDevice()
{ {
if (StereoDisplay) if (StereoDisplay)
{ {
if (NoLogout && StereoNGHMD)
StereoNGHMD->killUser();
delete StereoDisplay; delete StereoDisplay;
StereoDisplay = NULL; StereoDisplay = NULL;
StereoHMD = NULL; StereoHMD = NULL;
StereoNGHMD = NULL;
} }
IStereoDisplay::releaseAllLibraries(); IStereoDisplay::releaseAllLibraries();
} }

4
code/ryzom/common/data_common/msg.xml
View file

@ -1111,8 +1111,8 @@
sendto="EGS" sendto="EGS"
format="u32 u32 uc" format="u32 u32 uc"
description="set the cursom of the item in inventory $inventory in slot $slot to $text" /> description="set the cursom of the item in inventory $inventory in slot $slot to $text" />
<leaf name="DISABLE_LOGOUT_BUTTON" <leaf name="DUMMY"
description="disables the logout button on the client" /> description="stupid server....." />
</branch> </branch>
<branch name="TOTEM"> <branch name="TOTEM">
<leaf name="BUILD" <leaf name="BUILD"

17
code/ryzom/tools/client/client_patcher/main.cpp
View file

@ -28,9 +28,6 @@ string VersionName;
string LoginLogin, LoginPassword; string LoginLogin, LoginPassword;
uint32 LoginShardId = 0xFFFFFFFF; uint32 LoginShardId = 0xFFFFFFFF;
// stuff which is defined in other .cpp files
extern void tmpFlagRemovedPatchCategories(NLMISC::CConfigFile &cf);
bool useUtf8 = false; bool useUtf8 = false;
bool useEsc = false; bool useEsc = false;
@ -270,20 +267,6 @@ int main(int argc, char *argv[])
printf("Checking %s files to patch...\n", convert(CI18N::get("TheSagaOfRyzom")).c_str()); printf("Checking %s files to patch...\n", convert(CI18N::get("TheSagaOfRyzom")).c_str());
#ifdef NL_OS_UNIX
// don't use cfg, exe and dll from Windows version
CConfigFile::CVar var;
var.Type = CConfigFile::CVar::T_STRING;
std::vector<std::string> cats;
cats.push_back("main_exedll");
cats.push_back("main_cfg");
var.setAsString(cats);
ClientCfg.ConfigFile.insertVar("RemovePatchCategories", var);
// add categories to remove
tmpFlagRemovedPatchCategories(ClientCfg.ConfigFile);
#endif
// initialize patch manager and set the ryzom full path, before it's used // initialize patch manager and set the ryzom full path, before it's used
CPatchManager *pPM = CPatchManager::getInstance(); CPatchManager *pPM = CPatchManager::getInstance();

3
code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp
View file

@ -19,6 +19,3 @@
// stdafx.obj will contain the pre-compiled type information // stdafx.obj will contain the pre-compiled type information
#include "stdafx.h" #include "stdafx.h"
void foo_std_afx_to_remove_warning() {};

1
code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php
View file

@ -56,6 +56,7 @@
if (!isset($_POST['function'])) { if (!isset($_POST['function'])) {
//require the pages that are being needed. //require the pages that are being needed.
require_once( '../config.default.php' ); require_once( '../config.default.php' );
require_once( $AMS_LIB.'/libinclude.php' );
ini_set( "display_errors", true ); ini_set( "display_errors", true );
error_reporting( E_ALL ); error_reporting( E_ALL );