Fusion with compatibility
This commit is contained in:
commit
d18e6d8099
28 changed files with 443 additions and 438 deletions
|
@ -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)
|
||||||
|
|
|
@ -1,32 +1,32 @@
|
||||||
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||||
// Copyright (C) 2010 Winch Gate Property Limited
|
// Copyright (C) 2010 Winch Gate Property Limited
|
||||||
//
|
//
|
||||||
// This program is free software: you can redistribute it and/or modify
|
// This program is free software: you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU Affero General Public License as
|
// it under the terms of the GNU Affero General Public License as
|
||||||
// published by the Free Software Foundation, either version 3 of the
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
// License, or (at your option) any later version.
|
// License, or (at your option) any later version.
|
||||||
//
|
//
|
||||||
// This program is distributed in the hope that it will be useful,
|
// This program is distributed in the hope that it will be useful,
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
// GNU Affero General Public License for more details.
|
// GNU Affero General Public License for more details.
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#ifndef WIDGET_ADD_WATCHER
|
#ifndef WIDGET_ADD_WATCHER
|
||||||
#define WIDGET_ADD_WATCHER
|
#define WIDGET_ADD_WATCHER
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace NLGUI
|
namespace NLGUI
|
||||||
{
|
{
|
||||||
class IWidgetAdditionWatcher
|
class IWidgetAdditionWatcher
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void widgetAdded( const std::string &name ) = 0;
|
virtual void widgetAdded( const std::string &name ) = 0;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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__)
|
# define KHRONOS_APICALL __declspec(dllimport)
|
||||||
# if defined (_DLL_EXPORTS)
|
|
||||||
# define KHRONOS_APICALL __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define KHRONOS_APICALL __declspec(dllimport)
|
|
||||||
# endif
|
|
||||||
#elif defined (__SYMBIAN32__)
|
#elif defined (__SYMBIAN32__)
|
||||||
# if defined (__GCC32__)
|
# define KHRONOS_APICALL IMPORT_C
|
||||||
# define KHRONOS_APICALL __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# 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
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -81,6 +81,9 @@ namespace NLGUI
|
||||||
case TTSpecialWindow:
|
case TTSpecialWindow:
|
||||||
return "special";
|
return "special";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
|
|
|
@ -795,7 +795,10 @@ namespace NLGUI
|
||||||
return "radio_button";
|
return "radio_button";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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(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);
|
||||||
|
|
||||||
|
|
|
@ -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() );
|
||||||
|
|
|
@ -199,78 +199,78 @@ 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";
|
nlassert(false);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
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";
|
nlassert(false);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
void CGroupList::setProperty( const std::string &name, const std::string &value )
|
void CGroupList::setProperty( const std::string &name, const std::string &value )
|
||||||
|
@ -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,8 +367,8 @@ namespace NLGUI
|
||||||
onTextChanged();
|
onTextChanged();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
CInterfaceGroup::setProperty( name, value );
|
CInterfaceGroup::setProperty( name, value );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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" )
|
||||||
|
|
|
@ -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" )
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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++;
|
||||||
|
|
|
@ -1,77 +1,77 @@
|
||||||
#include "add_widget_widget.h"
|
#include "add_widget_widget.h"
|
||||||
#include "widget_info_tree.h"
|
#include "widget_info_tree.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
namespace GUIEditor
|
namespace GUIEditor
|
||||||
{
|
{
|
||||||
|
|
||||||
AddWidgetWidget::AddWidgetWidget( QWidget *parent ) :
|
AddWidgetWidget::AddWidgetWidget( QWidget *parent ) :
|
||||||
QWidget( parent )
|
QWidget( parent )
|
||||||
{
|
{
|
||||||
setupUi( this );
|
setupUi( this );
|
||||||
setupConnections();
|
setupConnections();
|
||||||
}
|
}
|
||||||
|
|
||||||
AddWidgetWidget::~AddWidgetWidget()
|
AddWidgetWidget::~AddWidgetWidget()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddWidgetWidget::setCurrentGroup( const QString &g )
|
void AddWidgetWidget::setCurrentGroup( const QString &g )
|
||||||
{
|
{
|
||||||
groupEdit->setText( g );
|
groupEdit->setText( g );
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddWidgetWidget::setupWidgetInfo( const CWidgetInfoTree *tree )
|
void AddWidgetWidget::setupWidgetInfo( const CWidgetInfoTree *tree )
|
||||||
{
|
{
|
||||||
std::vector< std::string > names;
|
std::vector< std::string > names;
|
||||||
tree->getNames( names, false );
|
tree->getNames( names, false );
|
||||||
|
|
||||||
widgetCB->clear();
|
widgetCB->clear();
|
||||||
|
|
||||||
std::sort( names.begin(), names.end() );
|
std::sort( names.begin(), names.end() );
|
||||||
|
|
||||||
std::vector< std::string >::const_iterator itr = names.begin();
|
std::vector< std::string >::const_iterator itr = names.begin();
|
||||||
while( itr != names.end() )
|
while( itr != names.end() )
|
||||||
{
|
{
|
||||||
widgetCB->addItem( QString( itr->c_str() ) );
|
widgetCB->addItem( QString( itr->c_str() ) );
|
||||||
++itr;
|
++itr;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddWidgetWidget::setupConnections()
|
void AddWidgetWidget::setupConnections()
|
||||||
{
|
{
|
||||||
connect( cancelButton, SIGNAL( clicked( bool ) ), this, SLOT( close() ) );
|
connect( cancelButton, SIGNAL( clicked( bool ) ), this, SLOT( close() ) );
|
||||||
connect( addButton, SIGNAL( clicked( bool ) ), this, SLOT( onAddClicked() ) );
|
connect( addButton, SIGNAL( clicked( bool ) ), this, SLOT( onAddClicked() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddWidgetWidget::onAddClicked()
|
void AddWidgetWidget::onAddClicked()
|
||||||
{
|
{
|
||||||
if( groupEdit->text().isEmpty() )
|
if( groupEdit->text().isEmpty() )
|
||||||
{
|
{
|
||||||
QMessageBox::warning( NULL,
|
QMessageBox::warning( NULL,
|
||||||
tr( "WARNING" ),
|
tr( "WARNING" ),
|
||||||
tr( "You need to be adding the new widget into a group!" ),
|
tr( "You need to be adding the new widget into a group!" ),
|
||||||
QMessageBox::Ok );
|
QMessageBox::Ok );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( nameEdit->text().isEmpty() )
|
if( nameEdit->text().isEmpty() )
|
||||||
{
|
{
|
||||||
QMessageBox::warning( NULL,
|
QMessageBox::warning( NULL,
|
||||||
tr( "WARNING" ),
|
tr( "WARNING" ),
|
||||||
tr( "You need to specify a name for your new widget!" ),
|
tr( "You need to specify a name for your new widget!" ),
|
||||||
QMessageBox::Ok );
|
QMessageBox::Ok );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
close();
|
close();
|
||||||
|
|
||||||
Q_EMIT adding( groupEdit->text(), widgetCB->currentText(), nameEdit->text() );
|
Q_EMIT adding( groupEdit->text(), widgetCB->currentText(), nameEdit->text() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,32 +1,32 @@
|
||||||
#ifndef ADD_WIDGET_WIDGET_H
|
#ifndef ADD_WIDGET_WIDGET_H
|
||||||
#define ADD_WIDGET_WIDGET_H
|
#define ADD_WIDGET_WIDGET_H
|
||||||
|
|
||||||
#include "ui_add_widget_widget.h"
|
#include "ui_add_widget_widget.h"
|
||||||
|
|
||||||
namespace GUIEditor
|
namespace GUIEditor
|
||||||
{
|
{
|
||||||
class CWidgetInfoTree;
|
class CWidgetInfoTree;
|
||||||
|
|
||||||
class AddWidgetWidget : public QWidget, public Ui::AddWidgetWidget
|
class AddWidgetWidget : public QWidget, public Ui::AddWidgetWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
AddWidgetWidget( QWidget *parent = NULL );
|
AddWidgetWidget( QWidget *parent = NULL );
|
||||||
~AddWidgetWidget();
|
~AddWidgetWidget();
|
||||||
|
|
||||||
void setCurrentGroup( const QString &g );
|
void setCurrentGroup( const QString &g );
|
||||||
void setupWidgetInfo( const CWidgetInfoTree *tree );
|
void setupWidgetInfo( const CWidgetInfoTree *tree );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void setupConnections();
|
void setupConnections();
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void onAddClicked();
|
void onAddClicked();
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void adding( const QString &parentGroup, const QString &widgetType, const QString &name );
|
void adding( const QString &parentGroup, const QString &widgetType, const QString &name );
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,46 +1,46 @@
|
||||||
// Object Viewer Qt GUI Editor plugin <http://dev.ryzom.com/projects/ryzom/>
|
// Object Viewer Qt GUI Editor plugin <http://dev.ryzom.com/projects/ryzom/>
|
||||||
// Copyright (C) 2010 Winch Gate Property Limited
|
// Copyright (C) 2010 Winch Gate Property Limited
|
||||||
//
|
//
|
||||||
// This program is free software: you can redistribute it and/or modify
|
// This program is free software: you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU Affero General Public License as
|
// it under the terms of the GNU Affero General Public License as
|
||||||
// published by the Free Software Foundation, either version 3 of the
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
// License, or (at your option) any later version.
|
// License, or (at your option) any later version.
|
||||||
//
|
//
|
||||||
// This program is distributed in the hope that it will be useful,
|
// This program is distributed in the hope that it will be useful,
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
// GNU Affero General Public License for more details.
|
// GNU Affero General Public License for more details.
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
namespace GUIEditor
|
namespace GUIEditor
|
||||||
{
|
{
|
||||||
class CWidgetInfoTree;
|
class CWidgetInfoTree;
|
||||||
|
|
||||||
/// Processes the GUI Editor's editor messages like delete, new, etc...
|
/// Processes the GUI Editor's editor messages like delete, new, etc...
|
||||||
class CEditorMessageProcessor : public QObject
|
class CEditorMessageProcessor : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
CEditorMessageProcessor( QObject *parent = NULL ) :
|
CEditorMessageProcessor( QObject *parent = NULL ) :
|
||||||
QObject( parent )
|
QObject( parent )
|
||||||
{
|
{
|
||||||
tree = NULL;
|
tree = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
~CEditorMessageProcessor(){}
|
~CEditorMessageProcessor(){}
|
||||||
|
|
||||||
void setTree( CWidgetInfoTree *tree ){ this->tree = tree; }
|
void setTree( CWidgetInfoTree *tree ){ this->tree = tree; }
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
void onDelete();
|
void onDelete();
|
||||||
void onAdd( const QString &parentGroup, const QString &widgetType, const QString &name );
|
void onAdd( const QString &parentGroup, const QString &widgetType, const QString &name );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CWidgetInfoTree *tree;
|
CWidgetInfoTree *tree;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -302,7 +302,7 @@ CClientConfig::CClientConfig()
|
||||||
Contrast = 0.f; // Default Monitor Contrast.
|
Contrast = 0.f; // Default Monitor Contrast.
|
||||||
Luminosity = 0.f; // Default Monitor Luminosity.
|
Luminosity = 0.f; // Default Monitor Luminosity.
|
||||||
Gamma = 0.f; // Default Monitor Gamma.
|
Gamma = 0.f; // Default Monitor Gamma.
|
||||||
|
|
||||||
VREnable = false;
|
VREnable = false;
|
||||||
VRDisplayDevice = "Auto";
|
VRDisplayDevice = "Auto";
|
||||||
VRDisplayDeviceId = "";
|
VRDisplayDeviceId = "";
|
||||||
|
@ -327,13 +327,13 @@ CClientConfig::CClientConfig()
|
||||||
TexturesLoginInterface.push_back("texture_interfaces_v3_login");
|
TexturesLoginInterface.push_back("texture_interfaces_v3_login");
|
||||||
|
|
||||||
DisplayAccountButtons = true;
|
DisplayAccountButtons = true;
|
||||||
CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
|
CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
|
||||||
ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php";
|
ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php";
|
||||||
EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
|
EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php";
|
||||||
BetaAccountURL = "http://www.ryzom.com/profile";
|
BetaAccountURL = "http://www.ryzom.com/profile";
|
||||||
ForgetPwdURL = "http://shard.ryzomcore.org/ams/index.php?page=forgot_password";
|
ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
|
||||||
FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1";
|
FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1";
|
||||||
LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php";
|
LoginSupportURL = "http://www.ryzom.com/en/support.html";
|
||||||
Position = CVector(0.f, 0.f, 0.f); // Default Position.
|
Position = CVector(0.f, 0.f, 0.f); // Default Position.
|
||||||
Heading = CVector(0.f, 1.f, 0.f); // Default Heading.
|
Heading = CVector(0.f, 1.f, 0.f); // Default Heading.
|
||||||
EyesHeight = 1.5f; // Default User Eyes Height.
|
EyesHeight = 1.5f; // Default User Eyes Height.
|
||||||
|
@ -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' !!!");
|
||||||
|
@ -887,14 +888,6 @@ void CClientConfig::setValues()
|
||||||
READ_STRING_DEV(ForgetPwdURL)
|
READ_STRING_DEV(ForgetPwdURL)
|
||||||
READ_STRING_DEV(FreeTrialURL)
|
READ_STRING_DEV(FreeTrialURL)
|
||||||
READ_STRING_DEV(LoginSupportURL)
|
READ_STRING_DEV(LoginSupportURL)
|
||||||
|
|
||||||
READ_STRING_FV(CreateAccountURL)
|
|
||||||
READ_STRING_FV(EditAccountURL)
|
|
||||||
READ_STRING_FV(ConditionsTermsURL)
|
|
||||||
READ_STRING_FV(BetaAccountURL)
|
|
||||||
READ_STRING_FV(ForgetPwdURL)
|
|
||||||
READ_STRING_FV(FreeTrialURL)
|
|
||||||
READ_STRING_FV(LoginSupportURL)
|
|
||||||
|
|
||||||
#ifndef RZ_NO_CLIENT
|
#ifndef RZ_NO_CLIENT
|
||||||
// if cookie is not empty, it means that the client was launch
|
// if cookie is not empty, it means that the client was launch
|
||||||
|
@ -1058,24 +1051,17 @@ void CClientConfig::setValues()
|
||||||
/////////////////////////
|
/////////////////////////
|
||||||
// NEW PATCHING SYSTEM //
|
// NEW PATCHING SYSTEM //
|
||||||
READ_BOOL_FV(PatchWanted)
|
READ_BOOL_FV(PatchWanted)
|
||||||
READ_STRING_FV(PatchServer)
|
|
||||||
READ_STRING_FV(PatchUrl)
|
|
||||||
READ_STRING_FV(PatchVersion)
|
|
||||||
READ_STRING_FV(RingReleaseNotePath)
|
|
||||||
READ_STRING_FV(ReleaseNotePath)
|
|
||||||
READ_BOOL_DEV(PatchWanted)
|
|
||||||
READ_STRING_DEV(PatchServer)
|
|
||||||
READ_STRING_DEV(PatchUrl)
|
READ_STRING_DEV(PatchUrl)
|
||||||
READ_STRING_DEV(PatchVersion)
|
READ_STRING_DEV(PatchVersion)
|
||||||
READ_STRING_DEV(RingReleaseNotePath)
|
READ_STRING_DEV(RingReleaseNotePath)
|
||||||
READ_STRING_DEV(ReleaseNotePath)
|
READ_STRING_DEV(ReleaseNotePath)
|
||||||
|
READ_STRING_FV(PatchServer)
|
||||||
|
|
||||||
/////////////////////////
|
/////////////////////////
|
||||||
// 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);
|
||||||
|
@ -2210,28 +2196,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
|
||||||
|
|
|
@ -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:" };
|
||||||
|
|
Loading…
Reference in a new issue