diff --git a/.travis.yml b/.travis.yml
index d815a8e8ceec3b8adb683ea7a1e558dd88042b4a..e8629ce52e142ea9c72450458427e4e64dfbbc22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
-language: cpp
+language: cpp fortran
compiler:
#- gcc # Avoid gcc because it exhausts travis VM memory
+ - gfortran
- clang
before_install:
@@ -10,13 +11,13 @@ before_install:
#- sudo add-apt-repository --yes ppa:kubuntu-ppa/backports
# Make sure package index is up to date:
- sudo apt-get -qq update
-
+ - sudo apt-get install gfortran
install:
# Install build tools:
- sudo apt-get install -yqq git ninja-build ccache
# Install library dependencies:
- - sudo apt-get install -yqq libatlas-dev libblas-dev liblapack-dev liblapacke-dev
- - sudo apt-get install -yqq freeglut3-dev libglui-dev libxmu-dev
+ - sudo apt-get install -yqq libatlas-dev libatlas-base-dev
+ - sudo apt-get install -yqq freeglut3-dev libglui-dev libglew-dev libxmu-dev
# Set user/email so any tests we might have for developers pass
- git config --global user.email "travis@travis-ci.org"
- git config --global user.name "Travis CI"
@@ -26,9 +27,17 @@ install:
- wget -q "http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz"
- tar xzf "cmake-3.1.0-Linux-x86_64.tar.gz"
- mv cmake-3.1.0-Linux-x86_64 install
+ - cd ~/VegaFEM-deps
+ - wget -q "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
+ - tar xzf "lapack-3.5.0.tgz"
+ - mkdir -p ~/VegaFEM-deps/lapack-build
+ - cd ~/VegaFEM-deps/lapack-build
+ - ~/VegaFEM-deps/cmake/install/bin/cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DLAPACKE:BOOL=ON -DUSE_OPTIMIZED_BLAS:BOOL=ON -DUSE_OPTIMIZED_LAPACK:BOOL=ON ../lapack-3.5.0
+ - make
+ - sudo make install
script:
- mkdir ~/VegaFEM-build && cd ~/VegaFEM-build
- - ~/VegaFEM-deps/cmake/install/bin/cmake -G Ninja "-DSITE:STRING=travis-ci.org" "-DBUILDNAME:STRING=${TRAVIS_OS_NAME}-${CC}-Job.${TRAVIS_JOB_NUMBER}-SMTK" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DVegaFEM_BUILD_MODEL_REDUCTION:BOOL=OFF -DVegaFEM_ENABLE_OpenGL_SUPPORT:BOOL=ON -DVegaFEM_ENABLE_OpenMP_SUPPORT:BOOL=OFF "-DCMAKE_INSTALL_PREFIX=${HOME}/VegaFEM-install" ${TRAVIS_BUILD_DIR}
+ - ~/VegaFEM-deps/cmake/install/bin/cmake -G Ninja "-DSITE:STRING=travis-ci.org" "-DBUILDNAME:STRING=${TRAVIS_OS_NAME}-${CC}-Job.${TRAVIS_JOB_NUMBER}-SMTK" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DVegaFEM_ENABLE_OpenGL_SUPPORT:BOOL=ON "-DCMAKE_INSTALL_PREFIX=${HOME}/VegaFEM-install" ${TRAVIS_BUILD_DIR}
- ninja
- ninja install
diff --git a/CMake/FindLAPACKE.cmake b/CMake/FindLAPACKE.cmake
index a9e73902e0cb253a8690c4f95a93a23749838f16..8b38b2e7a573303d0cd7927592c0662e33ad6a3b 100644
--- a/CMake/FindLAPACKE.cmake
+++ b/CMake/FindLAPACKE.cmake
@@ -9,12 +9,23 @@ find_path(CBLAS_INCLUDE_DIR
cblas.h
/usr/include
/usr/local/include
+ PATH_SUFFIXES
+ atlas
+ atlas-base
+ libblas
)
-find_library( CBLAS_LIBRARY
+find_library(CBLAS_LIBRARY
NAMES cblas
PATHS
/usr/lib64
+ /usr/lib
+ /usr/local/lib64
+ /usr/local/lib
+ PATH_SUFFIXES
+ atlas
+ atlas-base
+ libblas
)
# find_library( BLAS_LIBRARY
@@ -27,7 +38,7 @@ find_library( CBLAS_LIBRARY
find_library(LAPACKE_LIBRARY
NAMES lapacke
PATHS
- /usr/lib64
+ /usr/lib64
)
set(LAPACKE_LIBRARIES "${LAPACKE_LIBRARY}")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dd8593b26210a80c7bf151ae6395193e5d04d22..ea1d2e98921475f8f89f598bb455c3992419f239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,10 +28,13 @@ include(VegaFEMMacros)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE OFF)
option(VegaFEM_BUILD_MODEL_REDUCTION "Should model-reduction techniques be included?" ON)
-option(VegaFEM_ENABLE_ExpoKit_SUPPORT "Should matrix classes use ExpoKit for exponentiation?" OFF)
-option(VegaFEM_ENABLE_OpenMP_SUPPORT "Should OpenMP be used?" OFF)
+option(VegaFEM_ENABLE_ExpoKit_SUPPORT "Should matrix classes use ExpoKit for exponentiation?" OFF)
+# TODO: define USE_EXPOKIT if enabled
option(VegaFEM_ENABLE_OpenGL_SUPPORT "Should modules that require OpenGL be enabled?" ON)
option(VegaFEM_ENABLE_PTHREADS_SUPPORT "Use multithreading (pthread)" ON)
+# TODO: add option for arpack++ and define USEARPACKPLUSPLUS
+# TODO: add option for spooles and define SPOOLES_SOLVER_IS_AVAILABLE
+
if (VegaFEM_ENABLE_OpenGL_SUPPORT)
# Only add Cg support if OpenGL is turned on. This may change in the future.
option(VegaFEM_ENABLE_Cg_SUPPORT "Should modules that require Cg be enabled?" OFF)
@@ -157,20 +160,11 @@ if (VegaFEM_ENABLE_OpenGL_SUPPORT)
endif()
endif()
-if(VegaFEM_ENABLE_OpenMP_SUPPORT)
- find_package(OpenMP REQUIRED)
- mark_as_advanced(OpenMP_C_FLAGS OpenMP_CXX_FLAGS)
- #set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- #add_definitions(-DUSE_OPENMP)
-endif()
-
-#FindThreads
-if(WIN32)
- set(THREADS_USE_PTHREADS_WIN32 1)
-endif(WIN32)
if(VegaFEM_ENABLE_PTHREADS_SUPPORT)
- #FindPThreads
+ #FindThreads
+ if(WIN32)
+ set(THREADS_USE_PTHREADS_WIN32 1)
+ endif(WIN32)
find_package(PThreads REQUIRED)
if(THREADS_FOUND)
include_directories(${THREADS_PTHREADS_INCLUDE_DIR})
@@ -182,12 +176,13 @@ if (VegaFEM_BUILD_MODEL_REDUCTION)
if(MKL_FOUND)
set(BLA_VENDOR "Intel mkl")
include_directories(${INTEL_MKL_INCLUDE_DIR})
+ # TODO: set option for the paradiso solvers and define PARDISO_SOLVER_IS_AVAILABLE
else()
- find_package(LAPACKE REQUIRED) # ALso searches for cblas
+ find_package(LAPACKE REQUIRED) # Also searches for cblas
include_directories(${LAPACKE_INCLUDE_DIR})
include_directories(${CBLAS_INCLUDE_DIR})
endif()
- find_package(LAPACK)
+ find_package(LAPACK) # Also searches for blas
endif()
if (VegaFEM_ENABLE_OpenGL_SUPPORT)
@@ -243,6 +238,7 @@ if (VegaFEM_ENABLE_OpenGL_SUPPORT)
camera
lighting
sceneObject
+ glslPhong
)
if (VegaFEM_ENABLE_Cg_SUPPORT)
set(VegaFEM_Modules
@@ -253,7 +249,6 @@ if (VegaFEM_ENABLE_OpenGL_SUPPORT)
if (VegaFEM_BUILD_MODEL_REDUCTION)
set(VegaFEM_Modules
${VegaFEM_Modules}
- glslPhong
openGLHelper
sceneObjectReduced
renderVolumetricMesh
@@ -293,11 +288,4 @@ install(
Devel
)
-install(
- FILES
- ${CMAKE_CURRENT_BINARY_DIR}/include/vega/VegaFEMConfig.h
- DESTINATION include/vega
- COMPONENT Development
-)
-
add_subdirectory(include)
diff --git a/include/lapack-headers.h b/include/lapack-headers.h
index 858417c4587161126e94e7ca18444cc9c0a70edd..2ba66ec7ef0725b2c59c6a5268da6bafb7934451 100644
--- a/include/lapack-headers.h
+++ b/include/lapack-headers.h
@@ -8,24 +8,24 @@
#else // Requires Lapacke & cblas
#include<lapacke.h>
#include<cblas.h>
+ #define DGEEV LAPACK_dgeev
+ #define DGELSY LAPACK_dgelsy
#define DGESVD LAPACK_dgesvd
+ #define DGESVD LAPACK_dgesvd
+ #define DGESV LAPACK_dgesv
#define DGETRF LAPACK_dgetrf
#define DGETRI LAPACK_dgetri
- #define SGETRF LAPACK_sgetrf
- #define SGETRI LAPACK_sgetri
- #define DGESVD LAPACK_dgesvd
- #define SGESVD LAPACK_sgesvd
- #define DGELSY LAPACK_dgelsy
+ #define DGETRS LAPACK_dgetrs
+ #define DPOSV LAPACK_dposv
+ #define DSYEV LAPACK_dsyev
+ #define DSYGV LAPACK_dsygv
+ #define DSYSV LAPACK_dsysv
+ #define SGEEV LAPACK_sgeev
#define SGELSY LAPACK_sgelsy
- #define DGESV LAPACK_dgesv
+ #define SGESVD LAPACK_sgesvd
#define SGESV LAPACK_sgesv
- #define DSYEV LAPACK_dsyev
+ #define SGETRF LAPACK_sgetrf
+ #define SGETRI LAPACK_sgetri
#define SSYEV LAPACK_ssyev
- #define DSYGV LAPACK_dsygv
#define SSYGV LAPACK_ssygv
- #define SGEEV LAPACK_sgeev
- #define DGEEV LAPACK_dgeev
- #define DGETRS LAPACK_dgetrs
- #define DSYSV LAPACK_dsysv
- #define DPOSV LAPACK_dposv
#endif
\ No newline at end of file
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 3de3547fcbe6f0fc5893e44a47b1057428ffacf5..e0ecbec4b6595464f0ca1f27672bc26e95db5444 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,7 +1,9 @@
if(VegaFEM_BUILD_MODEL_REDUCTION)
add_subdirectory(largeModalDeformationFactory)
- add_subdirectory(reducedDynamicSolver-rt)
+ if(VegaFEM_ENABLE_Cg_SUPPORT)
+ add_subdirectory(reducedDynamicSolver-rt)
+ endif()
endif(VegaFEM_BUILD_MODEL_REDUCTION)
add_subdirectory(displayObj)
add_subdirectory(interactiveDeformableSimulator)
diff --git a/src/util/displayObj/CMakeLists.txt b/src/util/displayObj/CMakeLists.txt
index a50de3709bfc25b0c169d53b32ecb9dcbfe11da3..24d6e72df14315d4cf839f1fc9681983acc43feb 100644
--- a/src/util/displayObj/CMakeLists.txt
+++ b/src/util/displayObj/CMakeLists.txt
@@ -1,8 +1,13 @@
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
+# ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../libopenGLHelper
${CMAKE_CURRENT_SOURCE_DIR}/../../libperformanceCounter
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libglslPhong
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libobjMesh
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libvega-getopts
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libmatrixIO
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libloadList
)
add_executable(displayObj displayObj.cpp)
diff --git a/thirdparty/glui/2.35/lgpl-2.1.txt b/thirdparty/glui/2.35/lgpl-2.1.txt
deleted file mode 100644
index 4362b49151d7b34ef83b3067a8f9c9f877d72a0e..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/lgpl-2.1.txt
+++ /dev/null
@@ -1,502 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/thirdparty/glui/2.35/src/glui_window.cpp b/thirdparty/glui/2.35/src/glui_window.cpp
deleted file mode 100644
index 02c2d0d2612e4b98d121eccac883b1b0c6a107bf..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/src/glui_window.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
- glui_window.cpp - GLUI_Button control class
-
- GLUI User Interface Toolkit (LGPL)
- Copyright (c) 1998 Paul Rademacher
-
- WWW: http://sourceforge.net/projects/glui/
- Forums: http://sourceforge.net/forum/?group_id=92496
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-#include "GL/glui.h"
-#include "glui_internal.h"
-
-GLUI_Glut_Window::GLUI_Glut_Window()
-: GLUI_Node(),
-
- glut_window_id(0),
- glut_keyboard_CB(NULL),
- glut_special_CB(NULL),
- glut_reshape_CB(NULL),
- glut_passive_motion_CB(NULL),
- glut_mouse_CB(NULL),
- glut_visibility_CB(NULL),
- glut_motion_CB(NULL),
- glut_display_CB(NULL),
- glut_entry_CB(NULL)
-{
-}
diff --git a/thirdparty/glui/2.35/src/msvc/example1.vcproj b/thirdparty/glui/2.35/src/msvc/example1.vcproj
deleted file mode 100755
index 651b1e3f078bf85f1af821d61b332febb0a6c4f7..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/src/msvc/example1.vcproj
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="example1"
- ProjectGUID="{7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/example1.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example1.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\Release/example1.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/example1.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Debug/example1.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example1d.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/example1.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/example1.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\example\example1.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example2.vcproj b/thirdparty/glui/2.35/src/msvc/example2.vcproj
deleted file mode 100755
index cd02ddfb022bae26ca1b7846e56648de5a8731c5..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/src/msvc/example2.vcproj
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="example2"
- ProjectGUID="{10FB199D-975A-4320-A09A-570C0E8A7890}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="../include"
- InlineFunctionExpansion="1"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/example2.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example2.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\Release/example2.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/example2.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Debug/example2.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example2d.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/example2.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/example2.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\example\example2.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example3.vcproj b/thirdparty/glui/2.35/src/msvc/example3.vcproj
deleted file mode 100755
index c568921eb5e1c5a1c6d68bc5c96ee1e39223dd4b..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/src/msvc/example3.vcproj
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="example3"
- ProjectGUID="{A0DFF582-F13B-4CFB-95CE-A026A503BDD8}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Debug/example3.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example3d.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/example3.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/example3.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/example3.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example3.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\Release/example3.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/example3.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\example\example3.cpp">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example4.vcproj b/thirdparty/glui/2.35/src/msvc/example4.vcproj
deleted file mode 100755
index 3a01a42a5ef5c552604c0fffb0aaa6c1a64124bd..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/src/msvc/example4.vcproj
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="example4"
- ProjectGUID="{DE98CD9A-9830-46F8-835D-FB4D82182A7C}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Debug/example4.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example4d.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/example4.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/example4.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="../include"
- InlineFunctionExpansion="1"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/example4.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example4.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\Release/example4.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/example4.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\example\example4.cpp">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example5.vcproj b/thirdparty/glui/2.35/src/msvc/example5.vcproj
deleted file mode 100755
index 07563419f99ec992e3cc38ec2da26dfca5a5cba7..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/src/msvc/example5.vcproj
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="example5"
- ProjectGUID="{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="../include"
- InlineFunctionExpansion="1"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/example5.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="bin/example5.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\Release/example5.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/example5.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\example5"
- IntermediateDirectory=".\example5"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\example5/example5.pch"
- AssemblerListingLocation=".\example5/"
- ObjectFile=".\example5/"
- ProgramDataBaseFileName=".\example5/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example5d.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\example5/example5.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\example5/example5.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\example\example5.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example6.vcproj b/thirdparty/glui/2.35/src/msvc/example6.vcproj
deleted file mode 100755
index 75b9ecde1bf22c895c100b08196d4dfa3936e161..0000000000000000000000000000000000000000
--- a/thirdparty/glui/2.35/src/msvc/example6.vcproj
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="example6"
- ProjectGUID="{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/example6.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="bin/example6.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\Release/example6.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/example6.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\example6"
- IntermediateDirectory=".\example6"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\example6/example6.pch"
- AssemblerListingLocation=".\example6/"
- ObjectFile=".\example6/"
- ProgramDataBaseFileName=".\example6/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
- OutputFile="bin/example6d.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\example6/example6.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\example6/example6.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\example\example6.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/CMakeLists.txt b/thirdparty/glui/2.36/src/CMakeLists.txt
old mode 100755
new mode 100644
similarity index 52%
rename from thirdparty/glui/2.35/src/CMakeLists.txt
rename to thirdparty/glui/2.36/src/CMakeLists.txt
index bd15d26c77a9033cac4cb2ebff184d5d1c449121..e637a6fcd5f7ddc88614d30ce59bb3f47cfd3a5f
--- a/thirdparty/glui/2.35/src/CMakeLists.txt
+++ b/thirdparty/glui/2.36/src/CMakeLists.txt
@@ -1,74 +1,73 @@
-if (NOT APPLE)
- find_package(X11)
-endif()
-
-# find_package(GLUT)
-
-#LIBGLUI = -L./lib -lglui
-#LIBGL = -lGLU -lGL
-#LIBS = -lXmu -lXext -lX11 -lXi -lm
-
-# One of the following options only...
-
-# (1) OpenGLUT
-# LIBGLUT = -L/usr/X11R6/lib -lopenglut
-# CPPFLAGS += -I/usr/X11R6/include -DGLUI_OPENGLUT
-
-# (2) FreeGLUT
-# LIBGLUT = -L/usr/X11R6/lib -lfreeglut
-# CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT
-
-#CPPFLAGS += -I/usr/X11R6/include
-
-#######################################
-
-set(GLUI_SRCS
- algebra3.cpp
- arcball.cpp
- glui.cpp
- glui_add_controls.cpp
- glui_bitmap_img_data.cpp
- glui_bitmaps.cpp
- glui_button.cpp
- glui_checkbox.cpp
- glui_column.cpp
- glui_commandline.cpp
- glui_control.cpp
- glui_edittext.cpp
- glui_filebrowser.cpp
- glui_list.cpp
- glui_listbox.cpp
- glui_mouse_iaction.cpp
- glui_node.cpp
- glui_panel.cpp
- glui_radio.cpp
- glui_rollout.cpp
- glui_rotation.cpp
- glui_scrollbar.cpp
- glui_separator.cpp
- glui_spinner.cpp
- glui_statictext.cpp
- glui_string.cpp
- glui_textbox.cpp
- glui_translation.cpp
- glui_tree.cpp
- glui_treepanel.cpp
- glui_window.cpp
- quaternion.cpp
- viewmodel.cpp
-)
-
-vega_add_library(glui
- SOURCES ${GLUI_SRCS}
-)
-target_include_directories(glui
- PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:include>
-)
-target_link_libraries(glui
- PUBLIC
- ${GLUT_LIBRARY}
- ${OPENGL_LIBRARIES}
-)
+if (NOT APPLE)
+ find_package(X11)
+endif()
+
+#LIBGLUI = -L./lib -lglui
+#LIBGL = -lGLU -lGL
+#LIBS = -lXmu -lXext -lX11 -lXi -lm
+
+# One of the following options only...
+
+# (1) OpenGLUT
+# LIBGLUT = -L/usr/X11R6/lib -lopenglut
+# CPPFLAGS += -I/usr/X11R6/include -DGLUI_OPENGLUT
+
+# (2) FreeGLUT
+# LIBGLUT = -L/usr/X11R6/lib -lfreeglut
+# CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT
+
+#CPPFLAGS += -I/usr/X11R6/include
+
+#######################################
+
+set(GLUI_SRCS
+ algebra3.cpp
+ arcball.cpp
+ glui.cpp
+ glui_add_controls.cpp
+ glui_bitmap_img_data.cpp
+ glui_bitmaps.cpp
+ glui_button.cpp
+ glui_checkbox.cpp
+ glui_column.cpp
+ glui_commandline.cpp
+ glui_control.cpp
+ glui_edittext.cpp
+ glui_filebrowser.cpp
+ glui_list.cpp
+ glui_listbox.cpp
+ glui_mouse_iaction.cpp
+ glui_node.cpp
+ glui_panel.cpp
+ glui_radio.cpp
+ glui_rollout.cpp
+ glui_rotation.cpp
+ glui_scrollbar.cpp
+ glui_separator.cpp
+ glui_spinner.cpp
+ glui_statictext.cpp
+ glui_string.cpp
+ glui_textbox.cpp
+ glui_translation.cpp
+ glui_tree.cpp
+ glui_treepanel.cpp
+ glui_window.cpp
+ quaternion.cpp
+ viewmodel.cpp
+ )
+
+vega_add_library(glui
+ SOURCES ${GLUI_SRCS}
+)
+target_include_directories(glui
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:include>
+)
+target_link_libraries(glui
+ PUBLIC
+ ${GLUT_LIBRARY}
+ ${OPENGL_LIBRARIES}
+)
+
diff --git a/thirdparty/glui/2.36/src/LICENSE.txt b/thirdparty/glui/2.36/src/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7c7481e80533874b80b916452739cb7a7f2c8047
--- /dev/null
+++ b/thirdparty/glui/2.36/src/LICENSE.txt
@@ -0,0 +1,33 @@
+ GLUI User Interface Toolkit
+ ---------------------------
+
+ (The ZLIB License)
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+
+ History of GLUI's License:
+ --------------------------
+ Originally, GLUI was licensed under LGPL because Paul Rademacher
+ just wanted something that was very permissive, and LGPL was the
+ thing he had heard of. I discussed the license with Paul at
+ SIGGRAPH 2006, where he told me the above, and also told me he was
+ supportive of changing the license to one of the less restrictive
+ open source licenses. So after contacting all the authors to get
+ their OK, GLUI is now under the ZLIB license.
+
+ Bill Baxter -- November 2007
diff --git a/thirdparty/glui/2.35/src/algebra3.cpp b/thirdparty/glui/2.36/src/algebra3.cpp
similarity index 97%
rename from thirdparty/glui/2.35/src/algebra3.cpp
rename to thirdparty/glui/2.36/src/algebra3.cpp
index 5101480e5b470786e704442241e60287fe1be088..143c43fb1ae09fb8fde2155ec6f7e5b7c240aaaa 100644
--- a/thirdparty/glui/2.35/src/algebra3.cpp
+++ b/thirdparty/glui/2.36/src/algebra3.cpp
@@ -2,25 +2,27 @@
algebra3.cpp, algebra3.h - C++ Vector and Matrix Algebra routines
- GLUI User Interface Toolkit (LGPL)
- Copyright (c) 1998 Paul Rademacher
+ GLUI User Interface Toolkit
+ Copyright (c) 1998-2007 Paul Rademacher
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*/
diff --git a/thirdparty/glui/2.35/src/algebra3.h b/thirdparty/glui/2.36/src/algebra3.h
similarity index 95%
rename from thirdparty/glui/2.35/src/algebra3.h
rename to thirdparty/glui/2.36/src/algebra3.h
index 9875b3a8c99bc4a42421c0418e4e75af7d04a906..0ee5622cba59de06f7cdd7c66f02d9b496ff180a 100644
--- a/thirdparty/glui/2.35/src/algebra3.h
+++ b/thirdparty/glui/2.36/src/algebra3.h
@@ -2,25 +2,27 @@
algebra3.cpp, algebra3.h - C++ Vector and Matrix Algebra routines
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
Copyright (c) 1998 Paul Rademacher
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*/
diff --git a/thirdparty/glui/2.35/src/arcball.cpp b/thirdparty/glui/2.36/src/arcball.cpp
similarity index 84%
rename from thirdparty/glui/2.35/src/arcball.cpp
rename to thirdparty/glui/2.36/src/arcball.cpp
index 63c983e68ce3639c6d2ff5c01cef5d840b6da460..177c910981a049c45a455bd13ee891eaf7b45216 100644
--- a/thirdparty/glui/2.35/src/arcball.cpp
+++ b/thirdparty/glui/2.36/src/arcball.cpp
@@ -5,7 +5,7 @@
--------------------------------------------------
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
Copyright (c) 1998 Paul Rademacher
Feb 1998, Paul Rademacher (rademach@cs.unc.edu)
Oct 2003, Nigel Stewart - GLUI Code Cleaning
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
**********************************************************************/
diff --git a/thirdparty/glui/2.35/src/arcball.h b/thirdparty/glui/2.36/src/arcball.h
similarity index 75%
rename from thirdparty/glui/2.35/src/arcball.h
rename to thirdparty/glui/2.36/src/arcball.h
index 18edd0598a51db9c1d4dd009420567590733b4dc..7382d9113d82a01bb2e10b1f3e2ab279c141bac5 100644
--- a/thirdparty/glui/2.35/src/arcball.h
+++ b/thirdparty/glui/2.36/src/arcball.h
@@ -2,7 +2,7 @@
arcball.h
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
Copyright (c) 1998 Paul Rademacher
Feb 1998, Paul Rademacher (rademach@cs.unc.edu)
Oct 2003, Nigel Stewart - GLUI Code Cleaning
@@ -11,19 +11,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------
diff --git a/thirdparty/glui/2.35/src/devcpp/example1.dev b/thirdparty/glui/2.36/src/devcpp/example1.dev
old mode 100755
new mode 100644
similarity index 93%
rename from thirdparty/glui/2.35/src/devcpp/example1.dev
rename to thirdparty/glui/2.36/src/devcpp/example1.dev
index 3b91c9e06f99a4a5d7a7407697389a7d4aaa5169..2ed99631cb607872b540ba21b546891078588e48
--- a/thirdparty/glui/2.35/src/devcpp/example1.dev
+++ b/thirdparty/glui/2.36/src/devcpp/example1.dev
@@ -1,59 +1,59 @@
-[Project]
-FileName=example1.dev
-Name=example1
-Ver=1
-IsCpp=1
-Type=1
-Compiler=
-CppCompiler=
-Includes=../
-Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
-Libs=.
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=./
-ObjectOutput=./
-OverrideOutput=0
-OverrideOutputName=example1.exe
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-
-[Unit1]
-FileName=..\example1.cpp
-Folder=
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=example1.exe
-ProductName=example1
-ProductVersion=0.1
-AutoIncBuildNr=0
-
+[Project]
+FileName=example1.dev
+Name=example1
+Ver=1
+IsCpp=1
+Type=1
+Compiler=
+CppCompiler=
+Includes=../
+Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
+Libs=.
+UnitCount=1
+Folders=
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=./
+ObjectOutput=./
+OverrideOutput=0
+OverrideOutputName=example1.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000
+
+[Unit1]
+FileName=..\example1.cpp
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=example1.exe
+ProductName=example1
+ProductVersion=0.1
+AutoIncBuildNr=0
+
diff --git a/thirdparty/glui/2.35/src/devcpp/example2.dev b/thirdparty/glui/2.36/src/devcpp/example2.dev
old mode 100755
new mode 100644
similarity index 93%
rename from thirdparty/glui/2.35/src/devcpp/example2.dev
rename to thirdparty/glui/2.36/src/devcpp/example2.dev
index fbd7f9a9e9e11aef53b282402f249eadd830a086..bbabeb52b26a7245de5ac6e44eae875c7a58b41d
--- a/thirdparty/glui/2.35/src/devcpp/example2.dev
+++ b/thirdparty/glui/2.36/src/devcpp/example2.dev
@@ -1,59 +1,59 @@
-[Project]
-FileName=example2.dev
-Name=example2
-Ver=1
-IsCpp=1
-Type=1
-Compiler=
-CppCompiler=
-Includes=../
-Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
-Libs=.
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=./
-ObjectOutput=./
-OverrideOutput=0
-OverrideOutputName=example2.exe
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-
-[Unit1]
-FileName=..\example2.cpp
-Folder=
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=example2.exe
-ProductName=example2
-ProductVersion=0.1
-AutoIncBuildNr=0
-
+[Project]
+FileName=example2.dev
+Name=example2
+Ver=1
+IsCpp=1
+Type=1
+Compiler=
+CppCompiler=
+Includes=../
+Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
+Libs=.
+UnitCount=1
+Folders=
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=./
+ObjectOutput=./
+OverrideOutput=0
+OverrideOutputName=example2.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000
+
+[Unit1]
+FileName=..\example2.cpp
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=example2.exe
+ProductName=example2
+ProductVersion=0.1
+AutoIncBuildNr=0
+
diff --git a/thirdparty/glui/2.35/src/devcpp/example3.dev b/thirdparty/glui/2.36/src/devcpp/example3.dev
old mode 100755
new mode 100644
similarity index 93%
rename from thirdparty/glui/2.35/src/devcpp/example3.dev
rename to thirdparty/glui/2.36/src/devcpp/example3.dev
index bfbf728f1bbcb8aab7c71602eeb3ee962f0b9a19..c64a9f031469b2ff9350d9c66fcbd2f7f68ef7dc
--- a/thirdparty/glui/2.35/src/devcpp/example3.dev
+++ b/thirdparty/glui/2.36/src/devcpp/example3.dev
@@ -1,59 +1,59 @@
-[Project]
-FileName=example3.dev
-Name=example3
-Ver=1
-IsCpp=1
-Type=1
-Compiler=
-CppCompiler=
-Includes=../
-Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
-Libs=.
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=./
-ObjectOutput=./
-OverrideOutput=0
-OverrideOutputName=example3.exe
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-
-[Unit1]
-FileName=..\example3.cpp
-Folder=
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=example3.exe
-ProductName=example3
-ProductVersion=0.1
-AutoIncBuildNr=0
-
+[Project]
+FileName=example3.dev
+Name=example3
+Ver=1
+IsCpp=1
+Type=1
+Compiler=
+CppCompiler=
+Includes=../
+Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
+Libs=.
+UnitCount=1
+Folders=
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=./
+ObjectOutput=./
+OverrideOutput=0
+OverrideOutputName=example3.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000
+
+[Unit1]
+FileName=..\example3.cpp
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=example3.exe
+ProductName=example3
+ProductVersion=0.1
+AutoIncBuildNr=0
+
diff --git a/thirdparty/glui/2.35/src/devcpp/example4.dev b/thirdparty/glui/2.36/src/devcpp/example4.dev
old mode 100755
new mode 100644
similarity index 93%
rename from thirdparty/glui/2.35/src/devcpp/example4.dev
rename to thirdparty/glui/2.36/src/devcpp/example4.dev
index 8c188e0cc215f4aa3fad3ed114a4a447239803f9..3dc53e1d071d9ab982e5a4d4ffca179f7b780903
--- a/thirdparty/glui/2.35/src/devcpp/example4.dev
+++ b/thirdparty/glui/2.36/src/devcpp/example4.dev
@@ -1,59 +1,59 @@
-[Project]
-FileName=example4.dev
-Name=example4
-Ver=1
-IsCpp=1
-Type=1
-Compiler=
-CppCompiler=
-Includes=../
-Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
-Libs=.
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=./
-ObjectOutput=./
-OverrideOutput=0
-OverrideOutputName=example4.exe
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-
-[Unit1]
-FileName=..\example4.cpp
-Folder=
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=example4.exe
-ProductName=example4
-ProductVersion=0.1
-AutoIncBuildNr=0
-
+[Project]
+FileName=example4.dev
+Name=example4
+Ver=1
+IsCpp=1
+Type=1
+Compiler=
+CppCompiler=
+Includes=../
+Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
+Libs=.
+UnitCount=1
+Folders=
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=./
+ObjectOutput=./
+OverrideOutput=0
+OverrideOutputName=example4.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000
+
+[Unit1]
+FileName=..\example4.cpp
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=example4.exe
+ProductName=example4
+ProductVersion=0.1
+AutoIncBuildNr=0
+
diff --git a/thirdparty/glui/2.35/src/devcpp/example5.dev b/thirdparty/glui/2.36/src/devcpp/example5.dev
old mode 100755
new mode 100644
similarity index 93%
rename from thirdparty/glui/2.35/src/devcpp/example5.dev
rename to thirdparty/glui/2.36/src/devcpp/example5.dev
index e05f59a452f21e6031554d546a00685cc9e164af..793b5456f0a730dded30a05b95fe5d3c7e449f90
--- a/thirdparty/glui/2.35/src/devcpp/example5.dev
+++ b/thirdparty/glui/2.36/src/devcpp/example5.dev
@@ -1,59 +1,59 @@
-[Project]
-FileName=example5.dev
-Name=example5
-Ver=1
-IsCpp=1
-Type=1
-Compiler=
-CppCompiler=
-Includes=../
-Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
-Libs=.
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=./
-ObjectOutput=./
-OverrideOutput=0
-OverrideOutputName=example5.exe
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-
-[Unit1]
-FileName=..\example5.cpp
-Folder=
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=example5.exe
-ProductName=example5
-ProductVersion=0.1
-AutoIncBuildNr=0
-
+[Project]
+FileName=example5.dev
+Name=example5
+Ver=1
+IsCpp=1
+Type=1
+Compiler=
+CppCompiler=
+Includes=../
+Linker=-lglui -lglut32 -lglu32 -lopengl32 -lstdc++_@@_
+Libs=.
+UnitCount=1
+Folders=
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=./
+ObjectOutput=./
+OverrideOutput=0
+OverrideOutputName=example5.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000
+
+[Unit1]
+FileName=..\example5.cpp
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=example5.exe
+ProductName=example5
+ProductVersion=0.1
+AutoIncBuildNr=0
+
diff --git a/thirdparty/glui/2.35/src/devcpp/glui.dev b/thirdparty/glui/2.36/src/devcpp/glui.dev
old mode 100755
new mode 100644
similarity index 92%
rename from thirdparty/glui/2.35/src/devcpp/glui.dev
rename to thirdparty/glui/2.36/src/devcpp/glui.dev
index 2ba714afe6d56a9a80e6861985ba7cb07f3aec5d..da4ef7892f61532ece2e74ea0f6ad1f2fb96a803
--- a/thirdparty/glui/2.35/src/devcpp/glui.dev
+++ b/thirdparty/glui/2.36/src/devcpp/glui.dev
@@ -1,559 +1,559 @@
-[Project]
-FileName=glui.dev
-Name=glui32
-Ver=1
-IsCpp=1
-Type=2
-Compiler=
-CppCompiler=
-Includes=../src
-Linker=
-Libs=
-UnitCount=51
-Folders=Include,Source
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=.\
-ObjectOutput=.\
-OverrideOutput=1
-OverrideOutputName=libglui.a
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-
-[Unit1]
-FileName=..\algebra3.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=..\arcball.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=..\glui.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=..\glui_add_controls.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=..\glui_bitmap_img_data.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=..\glui_bitmaps.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=..\glui_button.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=..\glui_checkbox.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=..\glui_column.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=..\glui_control.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=..\glui_edittext.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=..\glui_img_checkbox_0.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=..\glui_img_checkbox_0_dis.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=..\glui_img_checkbox_1.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=..\glui_img_checkbox_1_dis.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=..\glui_img_downarrow.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=..\glui_img_leftarrow.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit18]
-FileName=..\glui_img_listbox_down.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit19]
-FileName=..\glui_img_listbox_up.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit20]
-FileName=..\glui_img_listbox_up_dis.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit21]
-FileName=..\glui_img_radiobutton_0.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit22]
-FileName=..\glui_img_radiobutton_0_dis.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit23]
-FileName=..\glui_img_radiobutton_1.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit24]
-FileName=..\glui_img_radiobutton_1_dis.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit25]
-FileName=..\glui_img_rightarrow.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit26]
-FileName=..\glui_img_spindown_0.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=..\glui_img_spindown_1.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit28]
-FileName=..\glui_img_spindown_dis.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit29]
-FileName=..\glui_img_spinup_0.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit30]
-FileName=..\glui_img_spinup_1.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=..\glui_img_spinup_dis.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit32]
-FileName=..\glui_img_uparrow.c
-Folder=Source
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit33]
-FileName=..\glui_listbox.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit34]
-FileName=..\glui_mouse_iaction.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=..\glui_node.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=..\glui_panel.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit37]
-FileName=..\glui_radio.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
-FileName=..\glui_rollout.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit39]
-FileName=..\glui_rotation.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit40]
-FileName=..\glui_separator.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
-FileName=..\glui_spinner.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit42]
-FileName=..\glui_statictext.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=..\glui_translation.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=..\quaternion.cpp
-Folder=Source
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
-FileName=..\algebra3.h
-Folder=Include
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=..\arcball.h
-Folder=Include
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit47]
-FileName=..\quaternion.h
-Folder=Include
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit48]
-FileName=..\stdinc.h
-Folder=Include
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=..\viewmodel.h
-Folder=Include
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
-FileName=..\glui.h
-Folder=
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=libglui32.a
-ProductName=glui32
-ProductVersion=0.1
-AutoIncBuildNr=0
-
-[Unit51]
-FileName=..\..\..\..\SourceForge\glui\src\glui_window.cpp
-CompileCpp=1
-Folder=Source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
+[Project]
+FileName=glui.dev
+Name=glui32
+Ver=1
+IsCpp=1
+Type=2
+Compiler=
+CppCompiler=
+Includes=../src
+Linker=
+Libs=
+UnitCount=51
+Folders=Include,Source
+ObjFiles=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=.\
+ObjectOutput=.\
+OverrideOutput=1
+OverrideOutputName=libglui.a
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000
+
+[Unit1]
+FileName=..\algebra3.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=..\arcball.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=..\glui.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=..\glui_add_controls.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=..\glui_bitmap_img_data.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=..\glui_bitmaps.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=..\glui_button.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\glui_checkbox.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\glui_column.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\glui_control.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=..\glui_edittext.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\glui_img_checkbox_0.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\glui_img_checkbox_0_dis.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\glui_img_checkbox_1.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\glui_img_checkbox_1_dis.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\glui_img_downarrow.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\glui_img_leftarrow.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\glui_img_listbox_down.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\glui_img_listbox_up.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\glui_img_listbox_up_dis.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\glui_img_radiobutton_0.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\glui_img_radiobutton_0_dis.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\glui_img_radiobutton_1.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\glui_img_radiobutton_1_dis.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\glui_img_rightarrow.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\glui_img_spindown_0.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=..\glui_img_spindown_1.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=..\glui_img_spindown_dis.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=..\glui_img_spinup_0.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=..\glui_img_spinup_1.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=..\glui_img_spinup_dis.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=..\glui_img_uparrow.c
+Folder=Source
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=..\glui_listbox.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=..\glui_mouse_iaction.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=..\glui_node.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=..\glui_panel.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=..\glui_radio.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=..\glui_rollout.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=..\glui_rotation.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=..\glui_separator.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=..\glui_spinner.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=..\glui_statictext.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=..\glui_translation.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=..\quaternion.cpp
+Folder=Source
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=..\algebra3.h
+Folder=Include
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit46]
+FileName=..\arcball.h
+Folder=Include
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
+FileName=..\quaternion.h
+Folder=Include
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit48]
+FileName=..\stdinc.h
+Folder=Include
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=..\viewmodel.h
+Folder=Include
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit50]
+FileName=..\glui.h
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=libglui32.a
+ProductName=glui32
+ProductVersion=0.1
+AutoIncBuildNr=0
+
+[Unit51]
+FileName=..\..\..\..\SourceForge\glui\src\glui_window.cpp
+CompileCpp=1
+Folder=Source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/thirdparty/glui/2.36/src/doc/doxygen.cfg b/thirdparty/glui/2.36/src/doc/doxygen.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..d31a2cc10297321c5cd1c8811042e353b2a95a56
--- /dev/null
+++ b/thirdparty/glui/2.36/src/doc/doxygen.cfg
@@ -0,0 +1,231 @@
+# Doxyfile 1.5.3
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = Glui
+PROJECT_NUMBER = 2.35
+OUTPUT_DIRECTORY = doc/doxygen
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH = lib/
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+QT_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = YES
+OPTIMIZE_OUTPUT_JAVA = NO
+BUILTIN_STL_SUPPORT = NO
+CPP_CLI_SUPPORT = NO
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = YES
+EXTRACT_ANON_NSPACES = YES
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = NO
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = NO
+FILE_VERSION_FILTER =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text "
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = . include/GL
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS = *.cpp *.c *.h
+RECURSIVE = NO
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = NO
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = NO
+HTML_DYNAMIC_SECTIONS = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = YES
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = YES
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = YES
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = NO
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = YES
+CALLER_GRAPH = YES
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
diff --git a/thirdparty/glui/2.36/src/doc/glui_manual.doc b/thirdparty/glui/2.36/src/doc/glui_manual.doc
new file mode 100644
index 0000000000000000000000000000000000000000..714c5bf6c62b4fd679b0e17f0f1731c073487f87
Binary files /dev/null and b/thirdparty/glui/2.36/src/doc/glui_manual.doc differ
diff --git a/thirdparty/glui/2.35/src/doc/glui_manual.pdf b/thirdparty/glui/2.36/src/doc/glui_manual.pdf
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/src/doc/glui_manual.pdf
rename to thirdparty/glui/2.36/src/doc/glui_manual.pdf
diff --git a/thirdparty/glui/2.35/src/example/example1.cpp b/thirdparty/glui/2.36/src/example/example1.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/example/example1.cpp
rename to thirdparty/glui/2.36/src/example/example1.cpp
diff --git a/thirdparty/glui/2.35/src/example/example2.cpp b/thirdparty/glui/2.36/src/example/example2.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/example/example2.cpp
rename to thirdparty/glui/2.36/src/example/example2.cpp
diff --git a/thirdparty/glui/2.35/src/example/example3.cpp b/thirdparty/glui/2.36/src/example/example3.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/example/example3.cpp
rename to thirdparty/glui/2.36/src/example/example3.cpp
diff --git a/thirdparty/glui/2.35/src/example/example4.cpp b/thirdparty/glui/2.36/src/example/example4.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/example/example4.cpp
rename to thirdparty/glui/2.36/src/example/example4.cpp
diff --git a/thirdparty/glui/2.35/src/example/example5.cpp b/thirdparty/glui/2.36/src/example/example5.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/example/example5.cpp
rename to thirdparty/glui/2.36/src/example/example5.cpp
diff --git a/thirdparty/glui/2.35/src/example/example6.cpp b/thirdparty/glui/2.36/src/example/example6.cpp
similarity index 98%
rename from thirdparty/glui/2.35/src/example/example6.cpp
rename to thirdparty/glui/2.36/src/example/example6.cpp
index 1eaffce3d4dc14b1180c5120c00817c7380b0ca0..6111f1f6ee224b0fbc12bdeb65865a19e84e82fa 100644
--- a/thirdparty/glui/2.35/src/example/example6.cpp
+++ b/thirdparty/glui/2.36/src/example/example6.cpp
@@ -260,6 +260,9 @@ void control_cb(int control) {
}
}
}
+void textbox_cb(GLUI_Control *control) {
+ printf("Got textbox callback\n");
+}
//void out_of_memory() {
// printf("Out of memory!\n\n");
@@ -290,7 +293,7 @@ int main(int argc, char* argv[])
hah->set_h(180);
new GLUI_Column(ep,false);
- moo = new GLUI_TextBox(ep,true);
+ moo = new GLUI_TextBox(ep,true,1,textbox_cb);
moo->set_text(general);
moo->set_h(400);
moo->set_w(410);
diff --git a/thirdparty/glui/2.35/src/glui.cpp b/thirdparty/glui/2.36/src/glui.cpp
similarity index 97%
rename from thirdparty/glui/2.35/src/glui.cpp
rename to thirdparty/glui/2.36/src/glui.cpp
index 683f750263e2b080c77189d2ed8844df5f9283c5..7b9bf478a5d8824749aabb50be04028eea0cf38f 100644
--- a/thirdparty/glui/2.35/src/glui.cpp
+++ b/thirdparty/glui/2.36/src/glui.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
---------------------------
glui.cpp
@@ -12,19 +12,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
- This library 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
- Lesser General Public License for more details.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
#include "glui_internal_control.h"
@@ -581,10 +583,10 @@ void GLUI_Main::display( void )
}
/******* Draw GLUI window ******/
- glClearColor( (float) bkgd_color.r / 255.0,
- (float) bkgd_color.g / 255.0,
- (float) bkgd_color.b / 255.0,
- 1.0 );
+ glClearColor( bkgd_color[0] / 255.0f,
+ bkgd_color[1] / 255.0f,
+ bkgd_color[2] / 255.0f,
+ 1.0f );
glClear( GL_COLOR_BUFFER_BIT ); /* | GL_DEPTH_BUFFER_BIT ); */
set_ortho_projection();
@@ -1129,10 +1131,12 @@ GLUI_Main::GLUI_Main( void )
curr_cursor = GLUT_CURSOR_LEFT_ARROW;
int r=200, g=200, b=200;
- bkgd_color.set( r,g,b );
- bkgd_color_f[0] = r / 255.0;
- bkgd_color_f[1] = g / 255.0;
- bkgd_color_f[2] = b / 255.0;
+ bkgd_color[0] = r;
+ bkgd_color[1] = g;
+ bkgd_color[2] = b;
+ bkgd_color_f[0] = r / 255.0f;
+ bkgd_color_f[1] = g / 255.0f;
+ bkgd_color_f[2] = b / 255.0f;
/*** Create the main panel ***/
main_panel = new GLUI_Panel;
@@ -1148,7 +1152,7 @@ void GLUI_Main::draw_raised_box( int x, int y, int w, int h )
w = w+x;
h = h+y;
- glColor3ub( bkgd_color.r, bkgd_color.g, bkgd_color.b );
+ glColor3ubv( bkgd_color );
glBegin( GL_LINE_LOOP );
glVertex2i( x+1, y+1 ); glVertex2i( w-1, y+1 );
glVertex2i( w-1, h-1 ); glVertex2i( x+1, h-1 );
@@ -1179,7 +1183,7 @@ void GLUI_Main::draw_lowered_box( int x, int y, int w, int h )
w = w+x;
h = h+y;
- glColor3ub( bkgd_color.r, bkgd_color.g, bkgd_color.b );
+ glColor3ubv( bkgd_color );
glBegin( GL_LINE_LOOP );
glVertex2i( x+1, y+1 ); glVertex2i( w-1, y+1 );
glVertex2i( w-1, h-1 ); glVertex2i( x+1, h-1 );
diff --git a/thirdparty/glui/2.35/src/glui_add_controls.cpp b/thirdparty/glui/2.36/src/glui_add_controls.cpp
similarity index 91%
rename from thirdparty/glui/2.35/src/glui_add_controls.cpp
rename to thirdparty/glui/2.36/src/glui_add_controls.cpp
index 20ed43d123516b09f66c9ce301f27a79fad05030..ecf72b9a6e61061043c19222a91e5b9460c7f08d 100644
--- a/thirdparty/glui/2.35/src/glui_add_controls.cpp
+++ b/thirdparty/glui/2.36/src/glui_add_controls.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
---------------------------
glui_add_controls.cpp - Routines for adding controls to a GLUI window
@@ -16,19 +16,21 @@ that aren't used.
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_bitmap_img_data.cpp b/thirdparty/glui/2.36/src/glui_bitmap_img_data.cpp
similarity index 99%
rename from thirdparty/glui/2.35/src/glui_bitmap_img_data.cpp
rename to thirdparty/glui/2.36/src/glui_bitmap_img_data.cpp
index bfcef31fab303b4b1776404ca3dc467d68f255b0..e65884097740893204755d989035726482afaf51 100644
--- a/thirdparty/glui/2.35/src/glui_bitmap_img_data.cpp
+++ b/thirdparty/glui/2.36/src/glui_bitmap_img_data.cpp
@@ -28,7 +28,8 @@ enum {
UW, // User-interface white-- backgrounds of checkboxes and radio buttons
};
- Orion Sky Lawlor, olawlor@acm.org, 2006/05/04 (LGPL)
+ Orion Sky Lawlor, olawlor@acm.org, 2006/05/04
+ License: ZLIB
*/
/*----------------------- checkboxes --------------------------*/
diff --git a/thirdparty/glui/2.35/src/glui_bitmaps.cpp b/thirdparty/glui/2.36/src/glui_bitmaps.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/glui_bitmaps.cpp
rename to thirdparty/glui/2.36/src/glui_bitmaps.cpp
diff --git a/thirdparty/glui/2.35/src/glui_button.cpp b/thirdparty/glui/2.36/src/glui_button.cpp
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_button.cpp
rename to thirdparty/glui/2.36/src/glui_button.cpp
index 4b128cc04956d25352ec1a5fbf410ed8d79fffe1..a414cd8f161dd96a989dc00ffaeddad9ecf3ef0e 100644
--- a/thirdparty/glui/2.35/src/glui_button.cpp
+++ b/thirdparty/glui/2.36/src/glui_button.cpp
@@ -136,7 +136,7 @@ void GLUI_Button::draw_text( int sunken )
{
int string_width;
- glColor3ub( glui->bkgd_color.r, glui->bkgd_color.g, glui->bkgd_color.b );
+ glColor3ubv( glui->bkgd_color );
glDisable( GL_CULL_FACE );
glBegin( GL_QUADS );
glVertex2i( 2, 2 ); glVertex2i( w-2, 2 );
diff --git a/thirdparty/glui/2.35/src/glui_checkbox.cpp b/thirdparty/glui/2.36/src/glui_checkbox.cpp
similarity index 81%
rename from thirdparty/glui/2.35/src/glui_checkbox.cpp
rename to thirdparty/glui/2.36/src/glui_checkbox.cpp
index ed77b3638347c16bd835d1f2c044821d1e514621..12d619e6904290b9e9e92c5d0e124ce289847a3e 100644
--- a/thirdparty/glui/2.35/src/glui_checkbox.cpp
+++ b/thirdparty/glui/2.36/src/glui_checkbox.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
---------------------------
glui_checkbox - GLUI_Checkbox control class
@@ -14,19 +14,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
- This library 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
- Lesser General Public License for more details.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -148,7 +150,7 @@ void GLUI_Checkbox::draw_active_area( void )
glLineStipple( 1, 0x5555 );
glColor3f( 0., 0., 0. );
} else {
- glColor3ub( glui->bkgd_color.r, glui->bkgd_color.g, glui->bkgd_color.b );
+ glColor3ubv( glui->bkgd_color );
}
glBegin( GL_LINE_LOOP );
diff --git a/thirdparty/glui/2.35/src/glui_column.cpp b/thirdparty/glui/2.36/src/glui_column.cpp
similarity index 71%
rename from thirdparty/glui/2.35/src/glui_column.cpp
rename to thirdparty/glui/2.36/src/glui_column.cpp
index 29901bc3d3e20cdd3f000db9cebfb690d86accf0..8932fedb2bfb8c6b98212bb80c9285bf7286538c 100644
--- a/thirdparty/glui/2.35/src/glui_column.cpp
+++ b/thirdparty/glui/2.36/src/glui_column.cpp
@@ -12,19 +12,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_commandline.cpp b/thirdparty/glui/2.36/src/glui_commandline.cpp
similarity index 84%
rename from thirdparty/glui/2.35/src/glui_commandline.cpp
rename to thirdparty/glui/2.36/src/glui_commandline.cpp
index 7586598254676efd38a24870768c073c4c8b51bf..1237fcb27a13d04bdf9a1ffbc0cdb48d875cffcd 100644
--- a/thirdparty/glui/2.35/src/glui_commandline.cpp
+++ b/thirdparty/glui/2.36/src/glui_commandline.cpp
@@ -10,20 +10,21 @@
Copyright (c) 1998 Paul Rademacher, 2005 William Baxter
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
This program is -not- in the public domain.
diff --git a/thirdparty/glui/2.35/src/glui_control.cpp b/thirdparty/glui/2.36/src/glui_control.cpp
similarity index 95%
rename from thirdparty/glui/2.35/src/glui_control.cpp
rename to thirdparty/glui/2.36/src/glui_control.cpp
index 80248e77b648475119a58005341e55e0c0686ba3..0542fdbc68ab8e311b094f5250dd87286b54fef7 100644
--- a/thirdparty/glui/2.35/src/glui_control.cpp
+++ b/thirdparty/glui/2.36/src/glui_control.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -74,7 +76,7 @@ void GLUI_Control::set_to_bkgd_color( void )
if ( NOT glui )
return;
- glColor3ub( glui->bkgd_color.r, glui->bkgd_color.g, glui->bkgd_color.b );
+ glColor3ubv( glui->bkgd_color );
}
/******** GLUI_Control::draw_box_inwards_outline() ********/
@@ -806,13 +808,6 @@ void GLUI_Control::sync_live(int recurse, int draw_it)
changed = true;
}
}
- else if ( live_type == GLUI_LIVE_DOUBLE ) {
- if ( *((double*)ptr_val) != last_live_double ) {
- set_double_val( *((double*)ptr_val) );
- last_live_double = *((double*)ptr_val);
- changed = true;
- }
- }
else if ( live_type == GLUI_LIVE_TEXT ) {
if ( last_live_text.compare((const char*)ptr_val) != 0 ) {
set_text( (char*) ptr_val );
@@ -905,10 +900,6 @@ void GLUI_Control::output_live(int update_main_gfx)
*((float*)ptr_val) = float_val;
last_live_float = float_val;
}
- else if ( live_type == GLUI_LIVE_DOUBLE ) {
- *((double*)ptr_val) = double_val;
- last_live_double = double_val;
- }
else if ( live_type == GLUI_LIVE_TEXT ) {
strncpy( (char*) ptr_val, text.c_str(), text.length()+1);
last_live_text = text;
@@ -926,6 +917,8 @@ void GLUI_Control::output_live(int update_main_gfx)
fp++;
}
}
+ else if ( live_type == GLUI_LIVE_DOUBLE ) {
+ }
/** Update the main gfx window? **/
if ( update_main_gfx AND this->glui != NULL ) {
@@ -974,10 +967,6 @@ void GLUI_Control::init_live()
set_float_val( *((float*)ptr_val) );
last_live_float = *((float*)ptr_val);
}
- else if ( live_type == GLUI_LIVE_DOUBLE ) {
- set_double_val( *((double*)ptr_val) );
- last_live_double = *((double*)ptr_val);
- }
else if ( live_type == GLUI_LIVE_TEXT ) {
set_text( (const char*) ptr_val );
last_live_text = (const char*) ptr_val;
diff --git a/thirdparty/glui/2.35/src/glui_edittext.cpp b/thirdparty/glui/2.36/src/glui_edittext.cpp
similarity index 89%
rename from thirdparty/glui/2.35/src/glui_edittext.cpp
rename to thirdparty/glui/2.36/src/glui_edittext.cpp
index d804fa60faa1bd350ef07a41b0e977f6ebe57e0b..3f2865cc6b9abdeb93168a3c79ac026eee506804 100644
--- a/thirdparty/glui/2.35/src/glui_edittext.cpp
+++ b/thirdparty/glui/2.36/src/glui_edittext.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -53,9 +55,6 @@ GLUI_EditText::GLUI_EditText( GLUI_Node *parent, const char *name,
else if (data_type == GLUI_EDITTEXT_FLOAT) {
live_type = GLUI_LIVE_FLOAT;
}
- else if (data_type == GLUI_EDITTEXT_DOUBLE) {
- live_type = GLUI_LIVE_DOUBLE;
- }
common_construct( parent, name, data_type, live_type, live_var, id, callback );
}
@@ -87,15 +86,6 @@ GLUI_EditText::GLUI_EditText( GLUI_Node *parent, const char *name,
/****************************** GLUI_EditText::GLUI_EditText() **********/
-GLUI_EditText::GLUI_EditText( GLUI_Node *parent, const char *name,
- double *live_var,
- int id, GLUI_CB callback )
-{
- common_construct( parent, name, GLUI_EDITTEXT_DOUBLE, GLUI_LIVE_DOUBLE, live_var, id, callback);
-}
-
-/****************************** GLUI_EditText::GLUI_EditText() **********/
-
GLUI_EditText::GLUI_EditText( GLUI_Node *parent, const char *name,
char *live_var,
int id, GLUI_CB callback )
@@ -137,12 +127,6 @@ void GLUI_EditText::common_construct( GLUI_Node *parent, const char *name,
if ( data == NULL )
set_float_val(float_val); /** Set to some default, in case of no live var **/
}
- else if ( live_type == GLUI_LIVE_DOUBLE ) {
- num_periods = 1;
- if ( data == NULL )
- set_double_val(double_val); /** Set to some default, in case of no live var **/
- }
-
parent->add_control( this );
@@ -253,7 +237,7 @@ int GLUI_EditText::key_handler( unsigned char key,int modifiers )
if ( sel_start == sel_end ) { /* no selection */
if ( insertion_pt < (int)text.length() ) {
/*** See if we're deleting a period in a float data-type box ***/
- if ( ((data_type == GLUI_EDITTEXT_FLOAT) OR (data_type == GLUI_EDITTEXT_DOUBLE)) AND text[insertion_pt]=='.' )
+ if ( data_type == GLUI_EDITTEXT_FLOAT AND text[insertion_pt]=='.' )
num_periods--;
/*** Shift over string first ***/
@@ -282,7 +266,7 @@ int GLUI_EditText::key_handler( unsigned char key,int modifiers )
if ( sel_start == sel_end ) { /* no selection */
if ( insertion_pt > 0 ) {
/*** See if we're deleting a period in a float data-type box ***/
- if ( ((data_type == GLUI_EDITTEXT_FLOAT) OR (data_type == GLUI_EDITTEXT_DOUBLE)) AND text[insertion_pt-1]=='.' )
+ if ( data_type == GLUI_EDITTEXT_FLOAT AND text[insertion_pt-1]=='.' )
num_periods--;
/*** Shift over string first ***/
@@ -346,7 +330,7 @@ int GLUI_EditText::key_handler( unsigned char key,int modifiers )
regular_key = true;
/** Check if we only accept numbers **/
- if ((data_type == GLUI_EDITTEXT_FLOAT ) OR (data_type == GLUI_EDITTEXT_DOUBLE)) {
+ if (data_type == GLUI_EDITTEXT_FLOAT ) {
if ( (key < '0' OR key > '9') AND key != '.' AND key != '-' )
return true;
@@ -488,7 +472,6 @@ void GLUI_EditText::deactivate( void )
{
int new_int_val;
float new_float_val;
- double new_double_val;
active = false;
@@ -510,14 +493,6 @@ void GLUI_EditText::deactivate( void )
set_float_val( new_float_val );
}
- else if ( data_type == GLUI_EDITTEXT_DOUBLE ) {
- if ( text.length() == 0 ) /* zero-length string - make it "0.0" */
- text = "0.0";
-
- new_double_val = atof( text.c_str() );
-
- set_double_val( new_double_val );
- }
else if ( data_type == GLUI_EDITTEXT_INT ) {
if ( text.length() == 0 ) /* zero-length string - make it "0" */
text = "0";
@@ -1006,7 +981,7 @@ void GLUI_EditText::clear_substring( int start, int end )
printf( "'\n" ); flushout;
*/
/*** See if we're deleting a period in a float data-type box ***/
- if (( data_type == GLUI_EDITTEXT_FLOAT ) OR ( data_type == GLUI_EDITTEXT_DOUBLE ) ){
+ if ( data_type == GLUI_EDITTEXT_FLOAT ) {
for( i=start; i<end; i++ )
if ( text[i] == '.' )
num_periods = 0;
@@ -1036,8 +1011,7 @@ void GLUI_EditText::update_size( void )
/* w += delta; */
if ( data_type == GLUI_EDITTEXT_TEXT OR
- data_type == GLUI_EDITTEXT_FLOAT OR
- data_type == GLUI_EDITTEXT_DOUBLE) {
+ data_type == GLUI_EDITTEXT_FLOAT) {
if ( w < text_x_offset + GLUI_EDITTEXT_MIN_TEXT_WIDTH )
w = text_x_offset + GLUI_EDITTEXT_MIN_TEXT_WIDTH;
}
@@ -1065,7 +1039,6 @@ void GLUI_EditText::set_text( const char *new_text )
/** Update the spinner, if we have one **/
if ( spinner ) {
spinner->float_val = this->float_val;
- spinner->double_val = this->double_val;
spinner->int_val = this->int_val;
}
@@ -1094,37 +1067,11 @@ void GLUI_EditText::set_float_val( float new_val )
}
float_val = new_val;
- double_val = (double)new_val;
int_val = (int) new_val; /* Mirror the value as an int, too */
set_numeric_text();
}
-/******************************* GLUI_EditText::set_float_val() ************/
-
-void GLUI_EditText::set_double_val( double new_val )
-{
- if ( has_limits == GLUI_LIMIT_CLAMP ) {
- /*** Clamp the new value to the existing limits ***/
-
- CLAMP( new_val, double_low, double_high );
- }
- else if ( has_limits == GLUI_LIMIT_WRAP ) {
- /*** Clamp the value cyclically to the limits - that is, if the
- value exceeds the max, set it the the minimum, and conversely ***/
-
- if ( new_val < double_low )
- new_val = double_high;
- if ( new_val > double_high )
- new_val = double_low;
- }
-
- double_val = new_val;
- float_val = (float)new_val;
- int_val = (int) new_val; /* Mirror the value as an int, too */
-
- set_numeric_text();
-}
/********************************** GLUI_EditText::set_int_val() ************/
@@ -1147,7 +1094,6 @@ void GLUI_EditText::set_int_val( int new_val )
int_val = new_val;
float_val = (float) new_val; /* We mirror the value as a float, too */
- double_val = (double) new_val; /* We mirror the value as a double, too */
set_numeric_text();
}
@@ -1166,26 +1112,8 @@ void GLUI_EditText::set_float_limits( float low, float high, int limit_type )
int_low = (int) float_low;
int_high = (int) float_high;
- double_low = (double) float_low;
- double_high = (double) float_high;
}
-/********************************* GLUI_EditText::set_float_limits() *********/
-
-void GLUI_EditText::set_double_limits( double low, double high, int limit_type )
-{
- has_limits = limit_type;
- double_low = low;
- double_high = high;
-
- if ( NOT IN_BOUNDS( double_val, double_low, double_high ))
- set_double_val( double_low );
-
- int_low = (int) double_low;
- int_high = (int) double_high;
- float_low = (float) double_low;
- float_high = (float) double_high;
-}
/*********************************** GLUI_EditText::set_int_limits() *********/
@@ -1200,8 +1128,6 @@ void GLUI_EditText::set_int_limits( int low, int high, int limit_type )
float_low = (float) int_low;
float_high = (float) int_high;
- double_low = (double) int_low;
- double_high = (double) int_high;
}
@@ -1212,11 +1138,8 @@ void GLUI_EditText::set_numeric_text( void )
char buf_num[200];
int i, text_len;
- if (( data_type == GLUI_EDITTEXT_FLOAT ) OR ( data_type == GLUI_EDITTEXT_DOUBLE )){
- if ( data_type == GLUI_EDITTEXT_FLOAT )
- sprintf( buf_num, "%#g", float_val );
- else
- sprintf( buf_num, "%#g", double_val );
+ if ( data_type == GLUI_EDITTEXT_FLOAT ) {
+ sprintf( buf_num, "%#g", float_val );
num_periods = 0;
text_len = (int) strlen(buf_num);
diff --git a/thirdparty/glui/2.35/src/glui_filebrowser.cpp b/thirdparty/glui/2.36/src/glui_filebrowser.cpp
similarity index 80%
rename from thirdparty/glui/2.35/src/glui_filebrowser.cpp
rename to thirdparty/glui/2.36/src/glui_filebrowser.cpp
index d4265413ce3effa7a68abf76e05e49d4654c7934..20980e390d940e6e2caeae889f46754ecff2deb3 100644
--- a/thirdparty/glui/2.35/src/glui_filebrowser.cpp
+++ b/thirdparty/glui/2.36/src/glui_filebrowser.cpp
@@ -10,9 +10,22 @@
Copyright (c) 1998 Paul Rademacher
- This program is freely distributable without licensing fees and is
- provided without guarantee or warrantee expressed or implied. This
- program is -not- in the public domain.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
*****************************************************************************/
@@ -115,7 +128,7 @@ void GLUI_FileBrowser::fbreaddir(const char *d) {
} while (FindNextFile(hFind, &FN) != 0);
if (GetLastError() == ERROR_NO_MORE_FILES)
- FindClose(&FN);
+ FindClose(hFind);
else
perror("fbreaddir");
}
diff --git a/thirdparty/glui/2.35/src/glui_img_checkbox_0.c b/thirdparty/glui/2.36/src/glui_img_checkbox_0.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_checkbox_0.c
rename to thirdparty/glui/2.36/src/glui_img_checkbox_0.c
index 02930207ebc35e092cebeef5329667e8c1f11c79..e16f89440959322bbee312537340e952d9cc920c
--- a/thirdparty/glui/2.35/src/glui_img_checkbox_0.c
+++ b/thirdparty/glui/2.36/src/glui_img_checkbox_0.c
@@ -1,38 +1,38 @@
-
-
-int glui_img_checkbox_0[] = { 13, 13, /* width, height */
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
- 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
- 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 192,192,192,
- 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
- 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
- 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192,
- 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 255,255,255,
-};
+
+
+int glui_img_checkbox_0[] = { 13, 13, /* width, height */
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
+ 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
+ 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 192,192,192,
+ 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
+ 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
+ 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192,
+ 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_checkbox_0_dis.c b/thirdparty/glui/2.36/src/glui_img_checkbox_0_dis.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_checkbox_0_dis.c
rename to thirdparty/glui/2.36/src/glui_img_checkbox_0_dis.c
index 37a5d5c23f197f4450aee460c2e739b314677760..25737a602cb7a5ceb3300900745233fb417d6b1d
--- a/thirdparty/glui/2.35/src/glui_img_checkbox_0_dis.c
+++ b/thirdparty/glui/2.36/src/glui_img_checkbox_0_dis.c
@@ -1,38 +1,38 @@
-
-
-int glui_img_checkbox_0_dis[] = { 13, 13, /* width, height */
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
- 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
- 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192,
- 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 255,255,255,
-};
+
+
+int glui_img_checkbox_0_dis[] = { 13, 13, /* width, height */
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
+ 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
+ 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192,
+ 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_checkbox_1.c b/thirdparty/glui/2.36/src/glui_img_checkbox_1.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_checkbox_1.c
rename to thirdparty/glui/2.36/src/glui_img_checkbox_1.c
index a0ae25eb5986d0d5f2b6f75a7a32ae1691d9cc2e..48f53bdf8f950e9149b1f0a53e795347302a008d
--- a/thirdparty/glui/2.35/src/glui_img_checkbox_1.c
+++ b/thirdparty/glui/2.36/src/glui_img_checkbox_1.c
@@ -1,38 +1,38 @@
-
-
-int glui_img_checkbox_1[] = { 13, 13, /* width, height */
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
- 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
- 255,255,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
- 128,128,128, 0, 0, 0, 255,255,255, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
- 255,255,255, 0, 0, 0, 0, 0, 0, 255,255,255, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255, 192,192,192,
- 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
- 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0, 255,255,255,
- 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 0, 0, 0, 255,255,255, 192,192,192, 255,255,255,
- 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192,
- 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 255,255,255,
-};
+
+
+int glui_img_checkbox_1[] = { 13, 13, /* width, height */
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
+ 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
+ 255,255,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
+ 128,128,128, 0, 0, 0, 255,255,255, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
+ 255,255,255, 0, 0, 0, 0, 0, 0, 255,255,255, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255, 192,192,192,
+ 255,255,255, 128,128,128, 0, 0, 0, 255,255,255, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 255,255,255, 192,192,192, 255,255,255, 128,128,128,
+ 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0, 255,255,255,
+ 192,192,192, 255,255,255, 128,128,128, 0, 0, 0, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 0, 0, 0, 255,255,255, 192,192,192, 255,255,255,
+ 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 128,128,128, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192,
+ 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_checkbox_1_dis.c b/thirdparty/glui/2.36/src/glui_img_checkbox_1_dis.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_checkbox_1_dis.c
rename to thirdparty/glui/2.36/src/glui_img_checkbox_1_dis.c
index ae0feae2c9dfda2c6405eb7487efb9a8eb74357c..bd507ddb2b15446dd2cefccb5d13bfcf502d92a3
--- a/thirdparty/glui/2.35/src/glui_img_checkbox_1_dis.c
+++ b/thirdparty/glui/2.36/src/glui_img_checkbox_1_dis.c
@@ -1,38 +1,38 @@
-
-
-int glui_img_checkbox_1_dis[] = { 13, 13, /* width, height */
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
- 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
- 192,192,192, 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 128,128,128, 64, 64, 64, 192,192,192, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
- 192,192,192, 64, 64, 64, 64, 64, 64, 192,192,192, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
- 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64, 192,192,192,
- 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 64, 64, 64, 192,192,192, 192,192,192, 255,255,255,
- 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192,
- 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 255,255,255,
-};
+
+
+int glui_img_checkbox_1_dis[] = { 13, 13, /* width, height */
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
+ 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
+ 192,192,192, 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 128,128,128, 64, 64, 64, 192,192,192, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
+ 192,192,192, 64, 64, 64, 64, 64, 64, 192,192,192, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 128,128,128, 64, 64, 64, 192,192,192, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 192,192,192, 192,192,192, 255,255,255, 128,128,128,
+ 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64, 192,192,192,
+ 192,192,192, 255,255,255, 128,128,128, 64, 64, 64, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 64, 64, 64, 192,192,192, 192,192,192, 255,255,255,
+ 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 128,128,128, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192,
+ 255,255,255, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_downarrow.c b/thirdparty/glui/2.36/src/glui_img_downarrow.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_downarrow.c
rename to thirdparty/glui/2.36/src/glui_img_downarrow.c
index 97d5905d72531c2801c70dc69dbf5465bab8d31a..3ef95fb67c9920c36ed5a5aa1eeb58929a579e12
--- a/thirdparty/glui/2.35/src/glui_img_downarrow.c
+++ b/thirdparty/glui/2.36/src/glui_img_downarrow.c
@@ -1,56 +1,56 @@
-
-
-int glui_img_downarrow[] = { 16, 16, /* width, height */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 0, 0, 0,
-};
+
+
+int glui_img_downarrow[] = { 16, 16, /* width, height */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 0, 0, 0,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_leftarrow.c b/thirdparty/glui/2.36/src/glui_img_leftarrow.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_leftarrow.c
rename to thirdparty/glui/2.36/src/glui_img_leftarrow.c
index 48d325e855fe6a45a5c9422809bf05944ff5ac36..6d5fd542e0c69285a99a3218c8bde69c5730493f
--- a/thirdparty/glui/2.35/src/glui_img_leftarrow.c
+++ b/thirdparty/glui/2.36/src/glui_img_leftarrow.c
@@ -1,56 +1,56 @@
-
-
-int glui_img_leftarrow[] = { 16, 16, /* width, height */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 0, 0, 0,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 0, 0, 0,
-};
+
+
+int glui_img_leftarrow[] = { 16, 16, /* width, height */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 0, 0, 0,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 0, 0, 0,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_listbox_down.c b/thirdparty/glui/2.36/src/glui_img_listbox_down.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_listbox_down.c
rename to thirdparty/glui/2.36/src/glui_img_listbox_down.c
index 81bc53ee1fdfb854789fee544b787899535ed443..80f46ce48b48f79339d3cb4f3b4583bf8fc4302c
--- a/thirdparty/glui/2.35/src/glui_img_listbox_down.c
+++ b/thirdparty/glui/2.36/src/glui_img_listbox_down.c
@@ -1,42 +1,42 @@
-
-
-int glui_img_listbox_down[] = { 11, 17, /* width, height */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 127,127,127, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 127,127,127,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
- 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 0, 0, 0, 127,127,127, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 127,127,127, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 127,127,127,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 191,191,191, 127,127,127, 0, 0, 0,
- 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 0, 0, 0, 127,127,127, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 127,127,127, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 127,127,127,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
- 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 0, 0, 0, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 0, 0, 0,
-};
+
+
+int glui_img_listbox_down[] = { 11, 17, /* width, height */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 127,127,127, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 127,127,127,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
+ 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 0, 0, 0, 127,127,127, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 127,127,127, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 127,127,127,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 191,191,191, 127,127,127, 0, 0, 0,
+ 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 0, 0, 0, 127,127,127, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 127,127,127, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 127,127,127,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
+ 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 0, 0, 0, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 0, 0, 0,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_listbox_down.ppm b/thirdparty/glui/2.36/src/glui_img_listbox_down.ppm
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/src/glui_img_listbox_down.ppm
rename to thirdparty/glui/2.36/src/glui_img_listbox_down.ppm
diff --git a/thirdparty/glui/2.35/src/glui_img_listbox_up.c b/thirdparty/glui/2.36/src/glui_img_listbox_up.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_listbox_up.c
rename to thirdparty/glui/2.36/src/glui_img_listbox_up.c
index 160812ac4dfd6c1d26b5b76f68e4e243511fde44..abc4a7954ef0aa34e08556624d33177a85d40f5d
--- a/thirdparty/glui/2.35/src/glui_img_listbox_up.c
+++ b/thirdparty/glui/2.36/src/glui_img_listbox_up.c
@@ -1,42 +1,42 @@
-
-
-int glui_img_listbox_up[] = { 11, 17, /* width, height */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 0, 0, 0, 191,191,191, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 255,255,255,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 191,191,191,
- 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
- 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 0, 0, 0, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 0, 0, 0, 191,191,191, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 0, 0, 0, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 255,255,255,
- 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 191,191,191,
- 255,255,255, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 191,191,191, 127,127,127, 0, 0, 0,
- 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 0, 0, 0, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 0, 0, 0, 191,191,191, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 255,255,255,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 191,191,191,
- 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
- 191,191,191, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,252, 255,255,255, 127,127,127,
- 0, 0, 0, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 0, 0, 0,
-};
+
+
+int glui_img_listbox_up[] = { 11, 17, /* width, height */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 0, 0, 0, 191,191,191, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 255,255,255,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 191,191,191,
+ 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
+ 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 0, 0, 0, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 0, 0, 0, 191,191,191, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 0, 0, 0, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 255,255,255,
+ 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 191,191,191,
+ 255,255,255, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 191,191,191, 127,127,127, 0, 0, 0,
+ 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 0, 0, 0, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 0, 0, 0, 191,191,191, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 255,255,255,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 191,191,191,
+ 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
+ 191,191,191, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,252, 255,255,255, 127,127,127,
+ 0, 0, 0, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 0, 0, 0,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_listbox_up.ppm b/thirdparty/glui/2.36/src/glui_img_listbox_up.ppm
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/src/glui_img_listbox_up.ppm
rename to thirdparty/glui/2.36/src/glui_img_listbox_up.ppm
diff --git a/thirdparty/glui/2.35/src/glui_img_listbox_up_dis.c b/thirdparty/glui/2.36/src/glui_img_listbox_up_dis.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_listbox_up_dis.c
rename to thirdparty/glui/2.36/src/glui_img_listbox_up_dis.c
index a7a58432960419b105d87d39d24039ce6479f12b..67a21463a594b0aba9ebc671f0e4a0f1d3206fb0
--- a/thirdparty/glui/2.35/src/glui_img_listbox_up_dis.c
+++ b/thirdparty/glui/2.36/src/glui_img_listbox_up_dis.c
@@ -1,42 +1,42 @@
-
-
-int glui_img_listbox_up_dis[] = { 11, 17, /* width, height */
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 191,191,191, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 127,127,127, 191,191,191, 255,255,255,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 191,191,191,
- 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 127,127,127,
- 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 127,127,127, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 127,127,127, 191,191,191, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 254,254,254, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 127,127,127, 191,191,191, 255,255,255,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 254,254,254,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 191,191,191,
- 255,255,255, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 254,254,254, 191,191,191, 127,127,127, 127,127,127,
- 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 127,127,127, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 127,127,127, 191,191,191, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 127,127,127, 191,191,191, 255,255,255,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 191,191,191,
- 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 127,127,127,
- 191,191,191, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,252, 255,255,255, 127,127,127,
- 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127,
-};
+
+
+int glui_img_listbox_up_dis[] = { 11, 17, /* width, height */
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 191,191,191, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 127,127,127, 191,191,191, 255,255,255,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 191,191,191,
+ 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 127,127,127,
+ 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 127,127,127, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 127,127,127, 191,191,191, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 254,254,254, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 127,127,127, 191,191,191, 255,255,255,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 254,254,254,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 191,191,191,
+ 255,255,255, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 254,254,254, 191,191,191, 127,127,127, 127,127,127,
+ 191,191,191, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 127,127,127, 191,191,191, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 127,127,127, 191,191,191, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 127,127,127, 191,191,191, 255,255,255,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 191,191,191,
+ 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 127,127,127,
+ 191,191,191, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,252, 255,255,255, 127,127,127,
+ 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_listbox_up_dis.ppm b/thirdparty/glui/2.36/src/glui_img_listbox_up_dis.ppm
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/src/glui_img_listbox_up_dis.ppm
rename to thirdparty/glui/2.36/src/glui_img_listbox_up_dis.ppm
diff --git a/thirdparty/glui/2.35/src/glui_img_radiobutton_0.c b/thirdparty/glui/2.36/src/glui_img_radiobutton_0.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_radiobutton_0.c
rename to thirdparty/glui/2.36/src/glui_img_radiobutton_0.c
index 1b890875248fd553c9ad2bcb28237efb4a12f8ea..7cdf51eef86a445a6a66ab7bc1b2eeda79361214
--- a/thirdparty/glui/2.35/src/glui_img_radiobutton_0.c
+++ b/thirdparty/glui/2.36/src/glui_img_radiobutton_0.c
@@ -1,44 +1,44 @@
-
-
-int glui_img_radiobutton_0[] = { 14, 14, /* width, height */
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 192,192,192, 192,192,192, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 0, 0, 0,
- 0, 0, 0, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 128,128,128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,128,128, 128,128,128,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192,
-};
+
+
+int glui_img_radiobutton_0[] = { 14, 14, /* width, height */
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 192,192,192, 192,192,192, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 0, 0, 0,
+ 0, 0, 0, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 128,128,128, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,128,128, 128,128,128,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_radiobutton_0_dis.c b/thirdparty/glui/2.36/src/glui_img_radiobutton_0_dis.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_radiobutton_0_dis.c
rename to thirdparty/glui/2.36/src/glui_img_radiobutton_0_dis.c
index c1ba11618edfbdc6f3be328333692d79f82b7094..d10ceb6076f00aafbe6415eba079b698a97ee6a8
--- a/thirdparty/glui/2.35/src/glui_img_radiobutton_0_dis.c
+++ b/thirdparty/glui/2.36/src/glui_img_radiobutton_0_dis.c
@@ -1,44 +1,44 @@
-
-
-int glui_img_radiobutton_0_dis[] = { 14, 14, /* width, height */
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
- 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 64, 64, 64, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 64, 64, 64,
- 64, 64, 64, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 128,128,128, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 128,128,128, 128,128,128,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192,
-};
+
+
+int glui_img_radiobutton_0_dis[] = { 14, 14, /* width, height */
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
+ 64, 64, 64, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 64, 64, 64, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 64, 64, 64,
+ 64, 64, 64, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 128,128,128, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 128,128,128, 128,128,128,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_radiobutton_1.c b/thirdparty/glui/2.36/src/glui_img_radiobutton_1.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_radiobutton_1.c
rename to thirdparty/glui/2.36/src/glui_img_radiobutton_1.c
index f98109e71791a0f0ad05baf949ef726d8ce05ede..f859d07ee699e16acb3a252ba1abb5abf3c0e2e7
--- a/thirdparty/glui/2.35/src/glui_img_radiobutton_1.c
+++ b/thirdparty/glui/2.36/src/glui_img_radiobutton_1.c
@@ -1,44 +1,44 @@
-
-
-int glui_img_radiobutton_1[] = { 14, 14, /* width, height */
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 192,192,192, 192,192,192, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
- 255,255,255, 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 0, 0, 0,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 0, 0, 0,
- 0, 0, 0, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 128,128,128, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,128,128, 128,128,128,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192,
-};
+
+
+int glui_img_radiobutton_1[] = { 14, 14, /* width, height */
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 192,192,192, 192,192,192, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 255,255,255, 255,255,255,
+ 255,255,255, 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 255,255,255, 255,255,255, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 255,255,255, 255,255,255, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 0, 0, 0, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 0, 0, 0,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 0, 0, 0,
+ 0, 0, 0, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 128,128,128, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,128,128, 128,128,128,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_radiobutton_1_dis.c b/thirdparty/glui/2.36/src/glui_img_radiobutton_1_dis.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_radiobutton_1_dis.c
rename to thirdparty/glui/2.36/src/glui_img_radiobutton_1_dis.c
index e40f8f3dda92c7d88a0485616fe05596519d50af..35f0cb1b6d35101fd6d2843cb3fc38574316e8f4
--- a/thirdparty/glui/2.35/src/glui_img_radiobutton_1_dis.c
+++ b/thirdparty/glui/2.36/src/glui_img_radiobutton_1_dis.c
@@ -1,44 +1,44 @@
-
-
-int glui_img_radiobutton_1_dis[] = { 14, 14, /* width, height */
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
- 64, 64, 64, 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 64, 64, 64, 64, 64, 64,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 64, 64, 64,
- 64, 64, 64, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 128,128,128, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 128,128,128, 128,128,128,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192,
-};
+
+
+int glui_img_radiobutton_1_dis[] = { 14, 14, /* width, height */
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 128,128,128, 64, 64, 64, 192,192,192, 192,192,192, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 128,128,128,
+ 64, 64, 64, 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 192,192,192, 192,192,192, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 64, 64, 64, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 64, 64, 64, 64, 64, 64,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 64, 64, 64,
+ 64, 64, 64, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 128,128,128, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 128,128,128, 128,128,128,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_rightarrow.c b/thirdparty/glui/2.36/src/glui_img_rightarrow.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_rightarrow.c
rename to thirdparty/glui/2.36/src/glui_img_rightarrow.c
index 25c30b80a4d53d19eaef763ab5d2c21cf72c21a1..574c757139e423aaaf24e18fa30f2e3258229907
--- a/thirdparty/glui/2.35/src/glui_img_rightarrow.c
+++ b/thirdparty/glui/2.36/src/glui_img_rightarrow.c
@@ -1,56 +1,56 @@
-
-
-int glui_img_rightarrow[] = { 16, 16, /* width, height */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 0, 0, 0, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 0, 0, 0,
-};
+
+
+int glui_img_rightarrow[] = { 16, 16, /* width, height */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 0, 0, 0, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 0, 0, 0,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_spindown_0.c b/thirdparty/glui/2.36/src/glui_img_spindown_0.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_spindown_0.c
rename to thirdparty/glui/2.36/src/glui_img_spindown_0.c
index 9ef71364ea1cba73e23a17c49fb20a65fe86b89d..88fc8680bf20d3448b20a939fafa766165e33785
--- a/thirdparty/glui/2.35/src/glui_img_spindown_0.c
+++ b/thirdparty/glui/2.36/src/glui_img_spindown_0.c
@@ -1,24 +1,24 @@
-
-
-int glui_img_spindown_0[] = { 12, 8, /* width, height */
- 255,255,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 255,255,255, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 0, 0, 0, 255,255,255,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 0, 0, 0, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 127,127,127, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
- 255,255,255, 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 127,127,127, 191,191,191,
- 127,127,127, 0, 0, 0, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 0, 0, 0,
-};
+
+
+int glui_img_spindown_0[] = { 12, 8, /* width, height */
+ 255,255,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 255,255,255, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 0, 0, 0, 255,255,255,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 0, 0, 0, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 127,127,127, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
+ 255,255,255, 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 127,127,127, 191,191,191,
+ 127,127,127, 0, 0, 0, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 0, 0, 0,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_spindown_1.c b/thirdparty/glui/2.36/src/glui_img_spindown_1.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_spindown_1.c
rename to thirdparty/glui/2.36/src/glui_img_spindown_1.c
index a84d543126204fb33404d3c7b53f1555d2c4a141..0f4a1e978397cd49ddf932f4b9c1162f2089c3c8
--- a/thirdparty/glui/2.35/src/glui_img_spindown_1.c
+++ b/thirdparty/glui/2.36/src/glui_img_spindown_1.c
@@ -1,24 +1,24 @@
-
-
-int glui_img_spindown_1[] = { 12, 8, /* width, height */
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 0, 0, 0, 127,127,127, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 255,255,255, 0, 0, 0,
- 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 255,255,255, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 255,255,255, 0, 0, 0, 127,127,127,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 191,191,191, 191,191,191, 191,191,191, 255,255,255,
- 0, 0, 0, 127,127,127, 191,191,191, 127,127,127, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,191,191,
- 191,191,191, 255,255,255, 0, 0, 0, 127,127,127, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 255,255,255, 0, 0, 0,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 191,191,191,
- 255,255,255,
-};
+
+
+int glui_img_spindown_1[] = { 12, 8, /* width, height */
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 0, 0, 0, 127,127,127, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 255,255,255, 0, 0, 0,
+ 127,127,127, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 255,255,255, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 255,255,255, 0, 0, 0, 127,127,127,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 191,191,191, 191,191,191, 191,191,191, 255,255,255,
+ 0, 0, 0, 127,127,127, 191,191,191, 127,127,127, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,191,191,
+ 191,191,191, 255,255,255, 0, 0, 0, 127,127,127, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 255,255,255, 0, 0, 0,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 191,191,191,
+ 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_spindown_dis.c b/thirdparty/glui/2.36/src/glui_img_spindown_dis.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_spindown_dis.c
rename to thirdparty/glui/2.36/src/glui_img_spindown_dis.c
index 2d07b40884ecd17427d88a0afde460c630e3a8e7..e4843d709964c86a966cb1253444274e185080ac
--- a/thirdparty/glui/2.35/src/glui_img_spindown_dis.c
+++ b/thirdparty/glui/2.36/src/glui_img_spindown_dis.c
@@ -1,24 +1,24 @@
-
-
-int glui_img_spindown_dis[] = { 12, 8, /* width, height */
- 255,255,255, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 255,255,255, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 64, 64, 64, 255,255,255,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
- 64, 64, 64, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 127,127,127, 64, 64, 64, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
- 255,255,255, 191,191,191, 191,191,191, 127,127,127, 64, 64, 64,
- 255,255,255, 191,191,191, 191,191,191, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 255,255,255, 191,191,191,
- 127,127,127, 64, 64, 64, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 64, 64, 64, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 64, 64, 64,
-};
+
+
+int glui_img_spindown_dis[] = { 12, 8, /* width, height */
+ 255,255,255, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 255,255,255, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 64, 64, 64, 255,255,255,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 127,127,127,
+ 64, 64, 64, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 127,127,127, 64, 64, 64, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
+ 255,255,255, 191,191,191, 191,191,191, 127,127,127, 64, 64, 64,
+ 255,255,255, 191,191,191, 191,191,191, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 255,255,255, 191,191,191,
+ 127,127,127, 64, 64, 64, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 64, 64, 64, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 64, 64, 64,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_spinup_0.c b/thirdparty/glui/2.36/src/glui_img_spinup_0.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_spinup_0.c
rename to thirdparty/glui/2.36/src/glui_img_spinup_0.c
index 589071b1899f18f32a665ca1b1370af41064fc81..97ff07e6c82c3b1ddd1fc5247079042d519faa32
--- a/thirdparty/glui/2.35/src/glui_img_spinup_0.c
+++ b/thirdparty/glui/2.36/src/glui_img_spinup_0.c
@@ -1,24 +1,24 @@
-
-
-int glui_img_spinup_0[] = { 12, 8, /* width, height */
- 255,255,255, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 0, 0, 0, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 255,255,255,
- 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 127,127,127, 191,191,191, 127,127,127,
- 0, 0, 0, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 127,127,127, 191,191,191,
- 191,191,191, 127,127,127, 0, 0, 0, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 0, 0, 0, 127,127,127,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
- 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 0, 0, 0, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 0, 0, 0, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255,
-};
+
+
+int glui_img_spinup_0[] = { 12, 8, /* width, height */
+ 255,255,255, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 0, 0, 0, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 0, 0, 0, 255,255,255,
+ 191,191,191, 191,191,191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 127,127,127, 191,191,191, 127,127,127,
+ 0, 0, 0, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 127,127,127, 191,191,191,
+ 191,191,191, 127,127,127, 0, 0, 0, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 0, 0, 0, 127,127,127,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
+ 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 0, 0, 0, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 0, 0, 0, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_spinup_1.c b/thirdparty/glui/2.36/src/glui_img_spinup_1.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_spinup_1.c
rename to thirdparty/glui/2.36/src/glui_img_spinup_1.c
index 78ba70bf6825f9dc1c3193a35f52bd1f556751aa..da78c59a16efa9484f47a357682a5615c405899f
--- a/thirdparty/glui/2.35/src/glui_img_spinup_1.c
+++ b/thirdparty/glui/2.36/src/glui_img_spinup_1.c
@@ -1,24 +1,24 @@
-
-
-int glui_img_spinup_1[] = { 12, 8, /* width, height */
- 0, 0, 0, 127,127,127, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 0, 0, 0, 127,127,127, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 255,255,255, 0, 0, 0,
- 127,127,127, 191,191,191, 127,127,127, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,191,191, 191,191,191,
- 255,255,255, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
- 127,127,127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,191,191,
- 191,191,191, 191,191,191, 255,255,255, 0, 0, 0, 127,127,127,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 255,255,255,
- 0, 0, 0, 127,127,127, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 255,255,255, 0, 0, 0, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 191,191,191, 255,255,255, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 255,255,255,
-};
+
+
+int glui_img_spinup_1[] = { 12, 8, /* width, height */
+ 0, 0, 0, 127,127,127, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 0, 0, 0, 127,127,127, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 255,255,255, 0, 0, 0,
+ 127,127,127, 191,191,191, 127,127,127, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,191,191, 191,191,191,
+ 255,255,255, 0, 0, 0, 127,127,127, 191,191,191, 191,191,191,
+ 127,127,127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,191,191,
+ 191,191,191, 191,191,191, 255,255,255, 0, 0, 0, 127,127,127,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 0, 0, 0,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 255,255,255,
+ 0, 0, 0, 127,127,127, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 255,255,255, 0, 0, 0, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 191,191,191, 255,255,255, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_spinup_dis.c b/thirdparty/glui/2.36/src/glui_img_spinup_dis.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_spinup_dis.c
rename to thirdparty/glui/2.36/src/glui_img_spinup_dis.c
index a910840c199f8fee4a757d91bf8853382bde73c0..d6715146206a1769187a8eae15e838fd7cb5d2e8
--- a/thirdparty/glui/2.35/src/glui_img_spinup_dis.c
+++ b/thirdparty/glui/2.36/src/glui_img_spinup_dis.c
@@ -1,24 +1,24 @@
-
-
-int glui_img_spinup_dis[] = { 12, 8, /* width, height */
- 255,255,255, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 64, 64, 64, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 127,127,127, 64, 64, 64, 255,255,255,
- 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
- 127,127,127, 127,127,127, 255,255,255, 191,191,191, 127,127,127,
- 64, 64, 64, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 127,127,127, 127,127,127, 255,255,255, 191,191,191,
- 191,191,191, 127,127,127, 64, 64, 64, 255,255,255, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 255,255,255,
- 191,191,191, 191,191,191, 191,191,191, 127,127,127, 64, 64, 64,
- 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 127,127,127, 64, 64, 64, 255,255,255, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
- 191,191,191, 191,191,191, 191,191,191, 64, 64, 64, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255,
-};
+
+
+int glui_img_spinup_dis[] = { 12, 8, /* width, height */
+ 255,255,255, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 64, 64, 64, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 127,127,127, 64, 64, 64, 255,255,255,
+ 191,191,191, 191,191,191, 127,127,127, 127,127,127, 127,127,127,
+ 127,127,127, 127,127,127, 255,255,255, 191,191,191, 127,127,127,
+ 64, 64, 64, 255,255,255, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 127,127,127, 127,127,127, 255,255,255, 191,191,191,
+ 191,191,191, 127,127,127, 64, 64, 64, 255,255,255, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 255,255,255,
+ 191,191,191, 191,191,191, 191,191,191, 127,127,127, 64, 64, 64,
+ 255,255,255, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 127,127,127, 64, 64, 64, 255,255,255, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 191,191,191, 191,191,191,
+ 191,191,191, 191,191,191, 191,191,191, 64, 64, 64, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255,
+};
diff --git a/thirdparty/glui/2.35/src/glui_img_uparrow.c b/thirdparty/glui/2.36/src/glui_img_uparrow.c
old mode 100755
new mode 100644
similarity index 98%
rename from thirdparty/glui/2.35/src/glui_img_uparrow.c
rename to thirdparty/glui/2.36/src/glui_img_uparrow.c
index 746f8ca40be2c33d5c061e296ce057a2a5dd5be0..d1b678e33d703a25f566194fc0a3861141a47841
--- a/thirdparty/glui/2.35/src/glui_img_uparrow.c
+++ b/thirdparty/glui/2.36/src/glui_img_uparrow.c
@@ -1,56 +1,56 @@
-
-
-int glui_img_uparrow[] = { 16, 16, /* width, height */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
- 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
- 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
- 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
- 0, 0, 0,
-};
+
+
+int glui_img_uparrow[] = { 16, 16, /* width, height */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 192,192,192, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 128,128,128, 128,128,128, 128,128,128, 128,128,128,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 0, 0, 0, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 128,128,128, 0, 0, 0,
+ 192,192,192, 255,255,255, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 128,128,128,
+ 0, 0, 0, 192,192,192, 255,255,255, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 128,128,128, 0, 0, 0, 192,192,192, 255,255,255, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 128,128,128, 0, 0, 0, 192,192,192, 255,255,255,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 128,128,128, 0, 0, 0, 192,192,192,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 255,255,255, 255,255,255,
+ 255,255,255, 255,255,255, 255,255,255, 128,128,128, 0, 0, 0,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 192,192,192, 192,192,192, 192,192,192, 192,192,192, 192,192,192,
+ 0, 0, 0,
+};
diff --git a/thirdparty/glui/2.35/src/glui_internal.h b/thirdparty/glui/2.36/src/glui_internal.h
similarity index 71%
rename from thirdparty/glui/2.35/src/glui_internal.h
rename to thirdparty/glui/2.36/src/glui_internal.h
index 24f4947989542643e904676904ba0759d222f493..60d08e6eb47fcbe057769a9c5b30a1441ef4bbdc 100644
--- a/thirdparty/glui/2.35/src/glui_internal.h
+++ b/thirdparty/glui/2.36/src/glui_internal.h
@@ -1,3 +1,20 @@
+/*
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source
+*/
#ifndef GLUI_INTERNAL_H
#define GLUI_INTERNAL_H
@@ -101,5 +118,22 @@
/**** Return the ASCII control code given the non-control ASCII character */
#define CTRL(c) ( (c>=('a'-1)) ? (c-'a'+1) : (c-'A'+1) )
+/*
+typedef unsigned char Byte;
+
+#ifndef _RGBC_
+class RGBc
+{
+ public:
+ Byte r, g, b;
+
+ void set(Byte r,Byte g,Byte b) {this->r=r;this->g=g;this->b=b;}
+
+ RGBc( void ) {}
+ RGBc( Byte r, Byte g, Byte b ) { set( r, g, b ); }
+};
+#define _RGBC_
+#endif
+*/
#endif /* GLUI_INTERNAL_H */
diff --git a/thirdparty/glui/2.35/src/glui_internal_control.h b/thirdparty/glui/2.36/src/glui_internal_control.h
similarity index 60%
rename from thirdparty/glui/2.35/src/glui_internal_control.h
rename to thirdparty/glui/2.36/src/glui_internal_control.h
index 7e363aab123cd0f66d1005e2c9450f522e154d34..d454d533227e1bedfae66f83bc5b4fd7752e21a5 100644
--- a/thirdparty/glui/2.35/src/glui_internal_control.h
+++ b/thirdparty/glui/2.36/src/glui_internal_control.h
@@ -2,6 +2,21 @@
Header file for use by GLUI controls.
Everything you need is right here.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*/
#ifndef __GLUI_INTERNAL_CONTROL_H
diff --git a/thirdparty/glui/2.35/src/glui_list.cpp b/thirdparty/glui/2.36/src/glui_list.cpp
similarity index 93%
rename from thirdparty/glui/2.35/src/glui_list.cpp
rename to thirdparty/glui/2.36/src/glui_list.cpp
index 6ecf282a08be585ee1cc77c6641eb731bb3b0411..15b5501263689070b88777a71bad0ae1f0b07daf 100644
--- a/thirdparty/glui/2.35/src/glui_list.cpp
+++ b/thirdparty/glui/2.36/src/glui_list.cpp
@@ -10,9 +10,21 @@
Copyright (c) 2004 John Kew
- This program is freely distributable without licensing fees and is
- provided without guarantee or warrantee expressed or implied. This
- program is -not- in the public domain.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_listbox.cpp b/thirdparty/glui/2.36/src/glui_listbox.cpp
similarity index 92%
rename from thirdparty/glui/2.35/src/glui_listbox.cpp
rename to thirdparty/glui/2.36/src/glui_listbox.cpp
index d0d0dda656b40ce47b1d9becb149f310a9cc62df..36ca8818cefabfbb11afc043125940c3ec317706 100644
--- a/thirdparty/glui/2.35/src/glui_listbox.cpp
+++ b/thirdparty/glui/2.36/src/glui_listbox.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_mouse_iaction.cpp b/thirdparty/glui/2.36/src/glui_mouse_iaction.cpp
similarity index 86%
rename from thirdparty/glui/2.35/src/glui_mouse_iaction.cpp
rename to thirdparty/glui/2.36/src/glui_mouse_iaction.cpp
index 0acd69f7a28dab3744bc3ecad9e3f550e9613708..00e7dc41e2091f3b42718bc4f951eec37c5f0661 100644
--- a/thirdparty/glui/2.35/src/glui_mouse_iaction.cpp
+++ b/thirdparty/glui/2.36/src/glui_mouse_iaction.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_node.cpp b/thirdparty/glui/2.36/src/glui_node.cpp
similarity index 87%
rename from thirdparty/glui/2.35/src/glui_node.cpp
rename to thirdparty/glui/2.36/src/glui_node.cpp
index a943332f4b6b357934251298f12f05938a9e6453..a7010267e843881a8401f4312d111eddcd52174a 100644
--- a/thirdparty/glui/2.35/src/glui_node.cpp
+++ b/thirdparty/glui/2.36/src/glui_node.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_panel.cpp b/thirdparty/glui/2.36/src/glui_panel.cpp
similarity index 82%
rename from thirdparty/glui/2.35/src/glui_panel.cpp
rename to thirdparty/glui/2.36/src/glui_panel.cpp
index 3aa61ae8cf0e1c87cf353a039e07ba75daf79a00..5c3b116cb8013665eb2f726910afe3de389a34d8 100644
--- a/thirdparty/glui/2.35/src/glui_panel.cpp
+++ b/thirdparty/glui/2.36/src/glui_panel.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -124,7 +126,7 @@ void GLUI_Panel::draw( int x, int y )
str_width = string_width(name);
if ( glui )
- glColor3ub(glui->bkgd_color.r,glui->bkgd_color.g,glui->bkgd_color.b);
+ glColor3ubv(glui->bkgd_color);
glDisable( GL_CULL_FACE );
glBegin( GL_QUADS );
glVertex2i( left-3, 0 ); glVertex2i( left+str_width+3, 0 );
diff --git a/thirdparty/glui/2.35/src/glui_radio.cpp b/thirdparty/glui/2.36/src/glui_radio.cpp
similarity index 90%
rename from thirdparty/glui/2.35/src/glui_radio.cpp
rename to thirdparty/glui/2.36/src/glui_radio.cpp
index aef16685904b75a05b7f8f3e29c62aa996b7fa00..4b81f3f94d7c21990e72a776fe85ff9210653d59 100644
--- a/thirdparty/glui/2.35/src/glui_radio.cpp
+++ b/thirdparty/glui/2.36/src/glui_radio.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -335,7 +337,7 @@ void GLUI_RadioButton::draw_active_area( void )
glLineStipple( 1, 0x5555 );
glColor3f( 0., 0., 0. );
} else {
- glColor3ub( glui->bkgd_color.r, glui->bkgd_color.g, glui->bkgd_color.b );
+ glColor3ubv( glui->bkgd_color );
}
glBegin( GL_LINE_LOOP );
diff --git a/thirdparty/glui/2.35/src/glui_rollout.cpp b/thirdparty/glui/2.36/src/glui_rollout.cpp
similarity index 86%
rename from thirdparty/glui/2.35/src/glui_rollout.cpp
rename to thirdparty/glui/2.36/src/glui_rollout.cpp
index d29e00641a1b02c669b481f79fa59a8798a053f3..559d2bfb599bc43398f1602b5c0ecc79bd7bc438 100644
--- a/thirdparty/glui/2.35/src/glui_rollout.cpp
+++ b/thirdparty/glui/2.36/src/glui_rollout.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -186,7 +188,7 @@ void GLUI_Rollout::draw( int x, int y )
glui->draw_raised_box( left, top, w-left*2, 16 );
if ( glui )
- glColor3ub(glui->bkgd_color.r,glui->bkgd_color.g,glui->bkgd_color.b);
+ glColor3ubv(glui->bkgd_color);
glDisable( GL_CULL_FACE );
glBegin( GL_QUADS );
glVertex2i( left+1, top+1 ); glVertex2i( right-1, top+1 );
diff --git a/thirdparty/glui/2.35/src/glui_rotation.cpp b/thirdparty/glui/2.36/src/glui_rotation.cpp
similarity index 93%
rename from thirdparty/glui/2.35/src/glui_rotation.cpp
rename to thirdparty/glui/2.36/src/glui_rotation.cpp
index b02d743556e7442d3b9ccfe23eae67803962afef..b367ac8144de7d5d2a50c4ca113aca45612ac590 100644
--- a/thirdparty/glui/2.35/src/glui_rotation.cpp
+++ b/thirdparty/glui/2.36/src/glui_rotation.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_scrollbar.cpp b/thirdparty/glui/2.36/src/glui_scrollbar.cpp
similarity index 96%
rename from thirdparty/glui/2.35/src/glui_scrollbar.cpp
rename to thirdparty/glui/2.36/src/glui_scrollbar.cpp
index f0fb137026ed70e1008b38fa149e7cac5558a5d3..1a0e6a2991469ed13beea248bca92674b97cf9aa 100644
--- a/thirdparty/glui/2.35/src/glui_scrollbar.cpp
+++ b/thirdparty/glui/2.36/src/glui_scrollbar.cpp
@@ -9,9 +9,21 @@
Copyright (c) 2004 John Kew, 1998 Paul Rademacher
- This program is freely distributable without licensing fees and is
- provided without guarantee or warrantee expressed or implied. This
- program is -not- in the public domain.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -322,7 +334,7 @@ void GLUI_Scrollbar::draw_scroll_arrow(int arrowtype, int x, int y)
return; /* tri is NULL */
}
- glColor3ubv(&glui->bkgd_color.r);
+ glColor3ubv(glui->bkgd_color);
glRecti(x,y,x+GLUI_SCROLL_ARROW_WIDTH,y+GLUI_SCROLL_ARROW_HEIGHT);
if (!offset) {
glui->draw_raised_box(x,y+1,GLUI_SCROLL_ARROW_WIDTH-1,GLUI_SCROLL_ARROW_HEIGHT-1);
@@ -414,7 +426,7 @@ void GLUI_Scrollbar::draw_scroll() {
void GLUI_Scrollbar::draw_scroll_box(int x, int y, int w, int h)
{
if (!enabled) return;
- glColor3ubv(&glui->bkgd_color.r);
+ glColor3ubv(glui->bkgd_color);
glRecti(x,y,x+w,y+h);
glui->draw_raised_box(x,y, w-1, h-1);
diff --git a/thirdparty/glui/2.35/src/glui_separator.cpp b/thirdparty/glui/2.36/src/glui_separator.cpp
similarity index 64%
rename from thirdparty/glui/2.35/src/glui_separator.cpp
rename to thirdparty/glui/2.36/src/glui_separator.cpp
index 87907d8a38512954823a1b1afb1f9223ef1bb2ba..9a1c1ed770aa2d50b0908764cd020717d777335e 100644
--- a/thirdparty/glui/2.35/src/glui_separator.cpp
+++ b/thirdparty/glui/2.36/src/glui_separator.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_spinner.cpp b/thirdparty/glui/2.36/src/glui_spinner.cpp
similarity index 81%
rename from thirdparty/glui/2.35/src/glui_spinner.cpp
rename to thirdparty/glui/2.36/src/glui_spinner.cpp
index 817cb3775bcaf6ce48ab17d1dda06de14bbdd2fd..2b51917e0fa3483a02b7f50f037856ed7342604b 100644
--- a/thirdparty/glui/2.35/src/glui_spinner.cpp
+++ b/thirdparty/glui/2.36/src/glui_spinner.cpp
@@ -10,7 +10,7 @@
spinner does not explicitly keep track of the current value - this is all
handled by the underlying edittext control
-> thus, spinner->sync_live() has no meaning, nor spinner->output_live
- -> BUT, edittext will alter this spinner's double_val, float_val and int_val,
+ -> BUT, edittext will alter this spinner's float_val and int_val,
so that spinner->get/set will work
@@ -25,19 +25,21 @@ FIXME: there's a heck of a lot of duplication between this and glui_scrollbar.cp
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
- This library 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
- Lesser General Public License for more details.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -52,25 +54,6 @@ FIXME: there's a heck of a lot of duplication between this and glui_scrollbar.cp
#define GLUI_SPINNER_CALLBACK_INTERVAL 1
-/****************************** spinner_edittext_callback() ******************/
-/* This function is not used anymore. It has been replaced by directly */
-/* Including an optional pointer to a spinner from an edittext box */
-
-void spinner_edittext_callback( int id )
-{
- GLUI_Spinner *spinner;
-
- putchar( '.' ); flushout;
-
- spinner = (GLUI_Spinner*) id;
-
- if ( NOT spinner )
- return;
-
- spinner->do_callbacks();
-}
-
-
/****************************** GLUI_Spinner::GLUI_Spinner() ****************/
GLUI_Spinner::GLUI_Spinner( GLUI_Node* parent, const char *name,
@@ -97,14 +80,6 @@ GLUI_Spinner::GLUI_Spinner( GLUI_Node* parent, const char *name,
/****************************** GLUI_Spinner::GLUI_Spinner() ****************/
-GLUI_Spinner::GLUI_Spinner( GLUI_Node* parent, const char *name,
- double *live_var, int id, GLUI_CB callback )
-{
- common_construct(parent, name, GLUI_SPINNER_DOUBLE, live_var, id, callback);
-}
-
-/****************************** GLUI_Spinner::GLUI_Spinner() ****************/
-
GLUI_Spinner::GLUI_Spinner( GLUI_Node *parent, const char *name,
int data_t, void *live_var,
int id, GLUI_CB callback )
@@ -130,9 +105,6 @@ void GLUI_Spinner::common_construct( GLUI_Node* parent, const char *name,
else if ( data_t == GLUI_SPINNER_FLOAT ) {
text_type = GLUI_EDITTEXT_FLOAT;
}
- else if ( data_t == GLUI_SPINNER_DOUBLE ) {
- text_type = GLUI_EDITTEXT_DOUBLE;
- }
else {
assert(0); /* Did not pass in a valid data type */
}
@@ -178,9 +150,9 @@ int GLUI_Spinner::mouse_down_handler( int local_x, int local_y )
go ahead and increment by one for int spinners ***/
if ( data_type == GLUI_SPINNER_INT ) {
if ( state == GLUI_SPINNER_STATE_UP )
- edittext->set_double_val( edittext->float_val + 1.0 );
+ edittext->set_float_val( edittext->float_val + 1.0 );
else if ( state == GLUI_SPINNER_STATE_DOWN )
- edittext->set_double_val( edittext->float_val - .9 );
+ edittext->set_float_val( edittext->float_val - .9 );
}
do_click();
@@ -321,7 +293,7 @@ void GLUI_Spinner::draw( int x, int y )
glLineStipple( 1, 0x5555 );
}
else {
- glColor3ub( glui->bkgd_color.r,glui->bkgd_color.g,glui->bkgd_color.b );
+ glColor3ubv( glui->bkgd_color );
}
glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
@@ -374,16 +346,6 @@ void GLUI_Spinner::set_float_val( float new_val )
edittext->set_float_val( new_val );
}
-/******************************* GLUI_Spinner::set_double_val() ************/
-
-void GLUI_Spinner::set_double_val( double new_val )
-{
- if ( NOT edittext )
- return;
-
- edittext->set_double_val( new_val );
-}
-
/********************************** GLUI_Spinner::set_int_val() ************/
@@ -453,10 +415,10 @@ void GLUI_Spinner::do_click( void )
modifier_factor = .01f;
}
- if ( this->data_type == GLUI_SPINNER_DOUBLE OR 1) {
+ if ( this->data_type == GLUI_SPINNER_FLOAT OR 1) {
incr = growth * direction * modifier_factor * user_speed;
- edittext->set_double_val( edittext->double_val + incr );
- /** Remember, edittext mirrors the double, float and int values ***/
+ edittext->set_float_val( edittext->float_val + incr );
+ /** Remember, edittext mirrors the float and int values ***/
}
/*** Now update live variable and do callback. We don't want
@@ -487,10 +449,10 @@ void GLUI_Spinner::do_drag( int x, int y )
/* delta_x = x - last_x; */
delta_y = -(y - last_y);
- if ( this->data_type == GLUI_SPINNER_DOUBLE OR 1 ) {
+ if ( this->data_type == GLUI_SPINNER_FLOAT OR 1 ) {
incr = growth * delta_y * modifier_factor * user_speed;
- edittext->set_double_val( edittext->double_val + incr );
- /** Remember, edittext mirrors the double, float and int values ***/
+ edittext->set_float_val( edittext->float_val + incr );
+ /** Remember, edittext mirrors the float and int values ***/
}
last_x = x;
@@ -537,7 +499,6 @@ void GLUI_Spinner::do_callbacks( void )
if ( NOT edittext )
return;
this->float_val = edittext->float_val;
- this->double_val = edittext->double_val;
this->int_val = edittext->int_val;
/* *******************************************/
@@ -549,17 +510,12 @@ void GLUI_Spinner::do_callbacks( void )
if ( data_type == GLUI_SPINNER_FLOAT AND float_val == last_float_val ) {
return;
}
-
- if ( data_type == GLUI_SPINNER_DOUBLE AND double_val == last_double_val ) {
- return;
- }
}
this->execute_callback();
last_int_val = int_val;
last_float_val = float_val;
- last_double_val = double_val;
first_callback = false;
}
@@ -574,15 +530,6 @@ void GLUI_Spinner::set_float_limits( float low, float high, int limit_type )
edittext->set_float_limits( low, high, limit_type );
}
-/********************************* GLUI_Spinner::set_double_limits() *********/
-
-void GLUI_Spinner::set_double_limits( double low, double high, int limit_type )
-{
- if ( NOT edittext )
- return;
-
- edittext->set_double_limits( low, high, limit_type );
-}
/*********************************** GLUI_Spinner::set_int_limits() *********/
@@ -599,13 +546,11 @@ void GLUI_Spinner::set_int_limits( int low, int high, int limit_type )
void GLUI_Spinner::reset_growth( void )
{
- double lo, hi;
+ float lo, hi;
if ( edittext->has_limits == GLUI_LIMIT_NONE ) {
if ( data_type == GLUI_SPINNER_FLOAT )
growth = sqrt(ABS(edittext->float_val)) * .05f;
- else if ( data_type == GLUI_SPINNER_DOUBLE )
- growth = sqrt(ABS(edittext->double_val)) * .05;
else if ( data_type == GLUI_SPINNER_INT )
growth = .4f;
}
@@ -615,21 +560,16 @@ void GLUI_Spinner::reset_growth( void )
hi = edittext->float_high;
growth = (hi-lo) / GLUI_SPINNER_GROWTH_STEPS;
}
- else if ( data_type == GLUI_SPINNER_DOUBLE ) {
- lo = edittext->double_low;
- hi = edittext->double_high;
- growth = (hi-lo) / GLUI_SPINNER_GROWTH_STEPS;
- }
else if ( data_type == GLUI_SPINNER_INT ) {
- lo = (double) edittext->int_low;
- hi = (double) edittext->int_high;
+ lo = (float) edittext->int_low;
+ hi = (float) edittext->int_high;
growth = (hi-lo) / GLUI_SPINNER_GROWTH_STEPS;
}
}
- if ( growth == 0.0 )
- growth = .001;
+ if ( growth == 0.0f )
+ growth = .001f;
}
@@ -637,19 +577,15 @@ void GLUI_Spinner::reset_growth( void )
void GLUI_Spinner::increase_growth( void )
{
- double hi = 0.0,lo = 0.0;
+ float hi = 0.0,lo = 0.0;
if ( data_type == GLUI_SPINNER_FLOAT ) {
lo = edittext->float_low;
hi = edittext->float_high;
}
- else if ( data_type == GLUI_SPINNER_DOUBLE ) {
- lo = edittext->double_low;
- hi = edittext->double_high;
- }
else if ( data_type == GLUI_SPINNER_INT ) {
- lo = (double) edittext->int_low;
- hi = (double) edittext->int_high;
+ lo = (float) edittext->int_low;
+ hi = (float) edittext->int_high;
}
if ( growth < (hi-lo) / GLUI_SPINNER_MIN_GROWTH_STEPS )
@@ -680,15 +616,6 @@ float GLUI_Spinner::get_float_val( void )
return 0.0f;
}
-/********************************** GLUI_Spinner:get_float_val() *************/
-
-double GLUI_Spinner::get_double_val( void )
-{
- if (edittext)
- return edittext->double_val;
- else
- return 0.0;
-}
/********************************** GLUI_Spinner:get_int_val() *************/
diff --git a/thirdparty/glui/2.35/src/glui_statictext.cpp b/thirdparty/glui/2.36/src/glui_statictext.cpp
similarity index 69%
rename from thirdparty/glui/2.35/src/glui_statictext.cpp
rename to thirdparty/glui/2.36/src/glui_statictext.cpp
index 21ffa13ad1c0a2d5ba2e2228eacb7bd41c5dd2a8..8d6bebe141655040cf6b56fd8ec63e1099e15c82 100644
--- a/thirdparty/glui/2.35/src/glui_statictext.cpp
+++ b/thirdparty/glui/2.36/src/glui_statictext.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_string.cpp b/thirdparty/glui/2.36/src/glui_string.cpp
similarity index 52%
rename from thirdparty/glui/2.35/src/glui_string.cpp
rename to thirdparty/glui/2.36/src/glui_string.cpp
index fbf88ae59da01637c8ae390f097af1849f4d3aad..4e590072860996e7d492c287f004a78110123299 100644
--- a/thirdparty/glui/2.35/src/glui_string.cpp
+++ b/thirdparty/glui/2.36/src/glui_string.cpp
@@ -10,22 +10,21 @@
Copyright (c) 1998 Paul Rademacher (this file, Bill Baxter 2005)
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- This program is -not- in the public domain.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -46,7 +45,7 @@ GLUI_String& glui_format_str(GLUI_String& str, const char* fmt, ...)
va_list arg;
while (1) {
va_start(arg, fmt);
- int ret = vsnprintf(buf,299,fmt,arg);
+ int ret = vsnprintf(buf,bufsz-1,fmt,arg);
va_end(arg);
if (ret>=0) {
break;
diff --git a/thirdparty/glui/2.35/src/glui_textbox.cpp b/thirdparty/glui/2.36/src/glui_textbox.cpp
similarity index 97%
rename from thirdparty/glui/2.35/src/glui_textbox.cpp
rename to thirdparty/glui/2.36/src/glui_textbox.cpp
index bb3df5b75cb70121eac434d51e4026aba2e532bd..70f8d9af1299b524d07b0a3022233d15ca1e6378 100644
--- a/thirdparty/glui/2.35/src/glui_textbox.cpp
+++ b/thirdparty/glui/2.36/src/glui_textbox.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
@@ -319,7 +321,7 @@ int GLUI_TextBox::key_handler( unsigned char key,int modifiers )
void GLUI_TextBox::enable( void )
{
GLUI_Control::enable();
- scrollbar->enable();
+ if (scrollbar) scrollbar->enable();
}
/****************************** GLUI_TextBox::disable() **********/
@@ -327,7 +329,7 @@ void GLUI_TextBox::enable( void )
void GLUI_TextBox::disable( void )
{
GLUI_Control::disable();
- scrollbar->disable();
+ if (scrollbar) scrollbar->disable();
}
/****************************** GLUI_TextBox::activate() **********/
@@ -338,11 +340,11 @@ void GLUI_TextBox::activate( int how )
dump( stdout, "-> ACTIVATE" );
active = true;
+ orig_text = text;
+
if ( how == GLUI_ACTIVATE_MOUSE )
return; /* Don't select everything if activated with mouse */
- orig_text = text;
-
sel_start = 0;
sel_end = text.length();
insertion_pt = 0;
diff --git a/thirdparty/glui/2.35/src/glui_translation.cpp b/thirdparty/glui/2.36/src/glui_translation.cpp
similarity index 94%
rename from thirdparty/glui/2.35/src/glui_translation.cpp
rename to thirdparty/glui/2.36/src/glui_translation.cpp
index 43e82d87ad90918a45f6ce19281a536d497c5584..f262809d5ce5b78f9390857cc0d56557100e134f 100644
--- a/thirdparty/glui/2.35/src/glui_translation.cpp
+++ b/thirdparty/glui/2.36/src/glui_translation.cpp
@@ -13,19 +13,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/glui_tree.cpp b/thirdparty/glui/2.36/src/glui_tree.cpp
similarity index 88%
rename from thirdparty/glui/2.35/src/glui_tree.cpp
rename to thirdparty/glui/2.36/src/glui_tree.cpp
index f253fa4f9c3fda803ffa87eaeaec59542292d247..75735b72420e31a1b4fabaed2eb5c84b4019e3dd 100644
--- a/thirdparty/glui/2.35/src/glui_tree.cpp
+++ b/thirdparty/glui/2.36/src/glui_tree.cpp
@@ -10,9 +10,19 @@
Copyright (c) 1998 Paul Rademacher
- This program is freely distributable without licensing fees and is
- provided without guarantee or warrantee expressed or implied. This
- program is -not- in the public domain.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*****************************************************************************/
@@ -168,7 +178,7 @@ void GLUI_Tree::draw( int x, int y )
glui->draw_raised_box( left, top, 16, 16 );
if ( glui )
- glColor3ub(glui->bkgd_color.r,glui->bkgd_color.g,glui->bkgd_color.b);
+ glColor3ubv(glui->bkgd_color);
glDisable( GL_CULL_FACE );
glBegin( GL_QUADS );
glVertex2i( left+17, top+1 ); glVertex2i( right-1, top+1 );
diff --git a/thirdparty/glui/2.35/src/glui_treepanel.cpp b/thirdparty/glui/2.36/src/glui_treepanel.cpp
similarity index 92%
rename from thirdparty/glui/2.35/src/glui_treepanel.cpp
rename to thirdparty/glui/2.36/src/glui_treepanel.cpp
index fc3fd4a3518d27f1440643694f84842c6f3c2bf3..4cbf8c1954fbfe799fd39b0ff1105c1b630c542c 100644
--- a/thirdparty/glui/2.35/src/glui_treepanel.cpp
+++ b/thirdparty/glui/2.36/src/glui_treepanel.cpp
@@ -1,6 +1,25 @@
+/*
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
#include "GL/glui.h"
+
/****************************** GLUI_TreePanel::GLUI_TreePanel() *********/
GLUI_TreePanel::GLUI_TreePanel(GLUI_Node *parent, const char *name,
diff --git a/thirdparty/glui/2.36/src/glui_window.cpp b/thirdparty/glui/2.36/src/glui_window.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7e5d7f08864cc5cd93dd949afd54b7adb30308f0
--- /dev/null
+++ b/thirdparty/glui/2.36/src/glui_window.cpp
@@ -0,0 +1,46 @@
+/*
+
+ glui_window.cpp - GLUI_Button control class
+
+ GLUI User Interface Toolkit
+ Copyright (c) 1998 Paul Rademacher
+
+ WWW: http://sourceforge.net/projects/glui/
+ Forums: http://sourceforge.net/forum/?group_id=92496
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+#include "GL/glui.h"
+#include "glui_internal.h"
+
+GLUI_Glut_Window::GLUI_Glut_Window()
+: GLUI_Node(),
+
+ glut_window_id(0),
+ glut_keyboard_CB(NULL),
+ glut_special_CB(NULL),
+ glut_reshape_CB(NULL),
+ glut_passive_motion_CB(NULL),
+ glut_mouse_CB(NULL),
+ glut_visibility_CB(NULL),
+ glut_motion_CB(NULL),
+ glut_display_CB(NULL),
+ glut_entry_CB(NULL)
+{
+}
diff --git a/thirdparty/glui/2.35/src/include/GL/glui.h b/thirdparty/glui/2.36/src/include/GL/glui.h
similarity index 95%
rename from thirdparty/glui/2.35/src/include/GL/glui.h
rename to thirdparty/glui/2.36/src/include/GL/glui.h
index 32df6fda381aacea71ef2a79b8263735e51ffd33..0424e720a90f5a698d31d9ae4d4409f2df0436ea 100644
--- a/thirdparty/glui/2.35/src/include/GL/glui.h
+++ b/thirdparty/glui/2.36/src/include/GL/glui.h
@@ -1,7 +1,7 @@
/****************************************************************************
- GLUI User Interface Toolkit (LGPL)
- ----------------------------------
+ GLUI User Interface Toolkit
+ ---------------------------
glui.h - Main (and only) external header for
GLUI User Interface Toolkit
@@ -13,25 +13,34 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
- This library 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
- Lesser General Public License for more details.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
#ifndef GLUI_GLUI_H
#define GLUI_GLUI_H
+// Having stdlib here first fixes some 'exit() redefined' errors on MSVC.NET
+// that come from old GLUT headers.
+#if defined(WIN32)
+ #include <windows.h>
+#endif
+#include <cstdlib>
+
#if defined(GLUI_FREEGLUT)
// FreeGLUT does not yet work perfectly with GLUI
@@ -56,39 +65,45 @@
#endif
-#include <cstdlib>
#include <cstdio>
#include <cstring>
#include <string>
#include <vector>
-#define GLUI_VERSION 2.3f /********** Current version **********/
-
+/* GLUI API shared library export/import declarations. */
#if defined(_WIN32)
-#if !defined(GLUI_NO_LIB_PRAGMA)
-#pragma comment(lib, "glui32.lib") // Link automatically with GLUI library
-#endif
+# ifdef GLUI_BUILDING_LIB
+# ifdef GLUIDLL
+# define GLUIAPI __declspec(dllexport)
+# else
+# define GLUIAPI
+# endif
+# else
+# ifdef GLUIDLL
+# define GLUIAPI __declspec(dllimport)
+# else
+# define GLUIAPI
+# endif
+# endif
+#else
+#define GLUIAPI
#endif
-/********** Do some basic defines *******/
-#ifndef Byte
-#define Byte unsigned char
-#endif
+#define GLUI_VERSION 2.36f /********** Current version **********/
-#ifndef _RGBC_
-class RGBc {
-public:
- Byte r, g, b;
-
- void set(Byte r,Byte g,Byte b) {this->r=r;this->g=g;this->b=b;}
-
- RGBc( void ) {}
- RGBc( Byte r, Byte g, Byte b ) { set( r, g, b ); }
-};
-#define _RGBC_
+#if defined(_WIN32)
+# if !defined(GLUI_NO_LIB_PRAGMA) && !defined(GLUI_BUILDING_LIB)
+// Link automatically with GLUI library
+# if defined GLUIDLL // define this when using glui dynamic library
+# pragma comment(lib, "glui32dll.lib")
+# else
+# pragma comment(lib, "glui32.lib")
+# endif
+# endif
#endif
+
/********** List of GLUT callbacks ********/
enum GLUI_Glut_CB_Types
@@ -238,7 +253,7 @@ enum TranslationCodes
/************ A string type for us to use **********/
typedef std::string GLUI_String;
-GLUI_String& glui_format_str(GLUI_String &str, const char* fmt, ...);
+GLUIAPI GLUI_String& glui_format_str(GLUI_String &str, const char* fmt, ...);
/********* Pre-declare classes as needed *********/
@@ -269,14 +284,12 @@ class Arcball;
#define GLUI_EDITTEXT_TEXT 1
#define GLUI_EDITTEXT_INT 2
#define GLUI_EDITTEXT_FLOAT 3
-#define GLUI_EDITTEXT_DOUBLE 4
#define GLUI_SPINNER_INT GLUI_EDITTEXT_INT
#define GLUI_SPINNER_FLOAT GLUI_EDITTEXT_FLOAT
-#define GLUI_SPINNER_DOUBLE GLUI_EDITTEXT_DOUBLE
#define GLUI_SCROLL_INT GLUI_EDITTEXT_INT
#define GLUI_SCROLL_FLOAT GLUI_EDITTEXT_FLOAT
// This is only for deprecated interface
-#define GLUI_EDITTEXT_STRING 5
+#define GLUI_EDITTEXT_STRING 4
/*** Definition of callbacks ***/
typedef void (*GLUI_Update_CB) (int id);
@@ -293,7 +306,7 @@ typedef void (*Int4_CB) (int, int, int, int);
like a GLUI_Update_CB function pointer--which takes an int;
and a GLUI_Control_CB function pointer--which takes a GUI_Control object.
*/
-class GLUI_CB
+class GLUIAPI GLUI_CB
{
public:
GLUI_CB() : idCB(0),objCB(0) {}
@@ -326,7 +339,7 @@ class GLUI_Control;
Everything onscreen is a GLUI_Node--windows, buttons, etc.
The nodes are traversed for event processing, sizing, redraws, etc.
*/
-class GLUI_Node
+class GLUIAPI GLUI_Node
{
friend class GLUI_Tree; /* JVK */
friend class GLUI_Rollout;
@@ -409,7 +422,7 @@ enum GLUI_StdBitmaps_Codes
to represent small textures like checkboxes, arrows, etc.
via the GLUI_StdBitmaps class.
*/
-class GLUI_Bitmap
+class GLUIAPI GLUI_Bitmap
{
friend class GLUI_StdBitmaps;
@@ -440,7 +453,7 @@ private:
Keeps an array of GLUI_Bitmap objects to represent all the
images used in the UI: checkboxes, arrows, etc.
*/
-class GLUI_StdBitmaps
+class GLUIAPI GLUI_StdBitmaps
{
public:
GLUI_StdBitmaps();
@@ -470,7 +483,7 @@ private:
The master manages our interaction with GLUT.
There's only one GLUI_Master_Object.
*/
-class GLUI_Master_Object
+class GLUIAPI GLUI_Master_Object
{
friend void glui_idle_func();
@@ -552,7 +565,7 @@ private:
/**
This is the only GLUI_Master_Object in existence.
*/
-extern GLUI_Master_Object GLUI_Master;
+extern GLUIAPI GLUI_Master_Object GLUI_Master;
/************************************************************/
/* */
@@ -568,7 +581,7 @@ extern GLUI_Master_Object GLUI_Master;
This entire approach seems to be superceded by the "subwindow" flavor
of GLUI.
*/
-class GLUI_Glut_Window : public GLUI_Node
+class GLUIAPI GLUI_Glut_Window : public GLUI_Node
{
public:
GLUI_Glut_Window();
@@ -606,7 +619,7 @@ public:
A better name for this class might be "GLUI_Environment";
this class provides the window-level context for every control.
*/
-class GLUI_Main : public GLUI_Node
+class GLUIAPI GLUI_Main : public GLUI_Node
{
/********** Friend classes *************/
@@ -696,7 +709,7 @@ protected:
public:
GLUI_StdBitmaps std_bitmaps;
GLUI_String window_name;
- RGBc bkgd_color;
+ unsigned char bkgd_color[3];
float bkgd_color_f[3];
void *font;
@@ -758,7 +771,7 @@ public:
should be directly accessed by users (they should be protected,
not public); only subclasses.
*/
-class GLUI_Control : public GLUI_Node
+class GLUIAPI GLUI_Control : public GLUI_Node
{
public:
@@ -785,7 +798,6 @@ public:
/** Variable value storage */
float float_val; /**< Our float value */
- double double_val; /**< Our double value */
int int_val; /**< Our integer value */
float float_array_val[GLUI_DEF_MAX_ARRAY];
int float_array_size;
@@ -798,7 +810,6 @@ public:
/* These variables store the last value that live variable was known to have. */
int last_live_int;
float last_live_float;
- double last_live_double;
GLUI_String last_live_text;
float last_live_float_array[GLUI_DEF_MAX_ARRAY];
@@ -819,12 +830,10 @@ public:
virtual void set_name( const char *string );
virtual void set_int_val( int new_int ) { int_val = new_int; output_live(true); }
virtual void set_float_val( float new_float ) { float_val = new_float; output_live(true); }
- virtual void set_double_val( double new_double ) { double_val = new_double; output_live(true); }
virtual void set_ptr_val( void *new_ptr ) { ptr_val = new_ptr; output_live(true); }
virtual void set_float_array_val( float *array_ptr );
virtual float get_float_val( void ) { return float_val; }
- virtual double get_double_val( void ) { return double_val; }
virtual int get_int_val( void ) { return int_val; }
virtual void get_float_array_val( float *array_ptr );
virtual int get_id( void ) const { return user_id; }
@@ -922,9 +931,7 @@ public:
float_array_size = 0;
glui_format_str(name, "Control: %p", this);
float_val = 0.0;
- double_val = 0.0;
last_live_float = 0.0;
- last_live_double = 0.0;
ptr_val = NULL;
glui = NULL;
w = GLUI_DEFAULT_CONTROL_WIDTH;
@@ -961,7 +968,7 @@ public:
can be clicked. When clicked, a button
calls its GLUI_CB callback with its ID.
*/
-class GLUI_Button : public GLUI_Control
+class GLUIAPI GLUI_Button : public GLUI_Control
{
public:
bool currently_inside;
@@ -1010,7 +1017,7 @@ protected:
A checkbox, which can be checked on or off. Can be linked
to an int value, which gets 1 for on and 0 for off.
*/
-class GLUI_Checkbox : public GLUI_Control
+class GLUIAPI GLUI_Checkbox : public GLUI_Control
{
public:
int orig_value;
@@ -1066,7 +1073,7 @@ protected:
A GLUI_Column object separates all previous controls
from subsequent controls with a vertical bar.
*/
-class GLUI_Column : public GLUI_Control
+class GLUIAPI GLUI_Column : public GLUI_Control
{
public:
void draw( int x, int y );
@@ -1100,7 +1107,7 @@ protected:
/**
A GLUI_Panel contains a group of related controls.
*/
-class GLUI_Panel : public GLUI_Control
+class GLUIAPI GLUI_Panel : public GLUI_Control
{
public:
@@ -1144,7 +1151,7 @@ protected:
/**
A list of files the user can select from.
*/
-class GLUI_FileBrowser : public GLUI_Panel
+class GLUIAPI GLUI_FileBrowser : public GLUI_Panel
{
public:
/**
@@ -1208,7 +1215,7 @@ private:
A rollout contains a set of controls,
like a panel, but can be collapsed to just the name.
*/
-class GLUI_Rollout : public GLUI_Panel
+class GLUIAPI GLUI_Rollout : public GLUI_Panel
{
public:
@@ -1266,7 +1273,7 @@ protected:
/**
One collapsible entry in a GLUI_TreePanel.
*/
-class GLUI_Tree : public GLUI_Panel
+class GLUIAPI GLUI_Tree : public GLUI_Panel
{
public:
GLUI_Tree(GLUI_Node *parent, const char *name,
@@ -1366,7 +1373,7 @@ protected:
FIXME: There's an infinite loop in the traversal code (OSL 2006/06)
*/
-class GLUI_TreePanel : public GLUI_Panel
+class GLUIAPI GLUI_TreePanel : public GLUI_Panel
{
public:
GLUI_TreePanel(GLUI_Node *parent, const char *name,
@@ -1440,7 +1447,7 @@ class GLUI_Translation;
The main user-visible interface object to GLUI.
*/
-class GLUI : public GLUI_Main
+class GLUIAPI GLUI : public GLUI_Main
{
public:
/** DEPRECATED interface for creating new GLUI objects */
@@ -1584,7 +1591,7 @@ protected:
/* */
/************************************************************/
-class GLUI_EditText : public GLUI_Control
+class GLUIAPI GLUI_EditText : public GLUI_Control
{
public:
int has_limits;
@@ -1599,7 +1606,6 @@ public:
int num_periods;
int last_insertion_pt;
float float_low, float_high;
- double double_low, double_high;
int int_low, int_high;
GLUI_Spinner *spinner;
int debug;
@@ -1632,10 +1638,8 @@ public:
void update_size( void );
void set_float_limits( float low,float high,int limit_type=GLUI_LIMIT_CLAMP);
- void set_double_limits( double low,double high,int limit_type=GLUI_LIMIT_CLAMP);
void set_int_limits( int low, int high, int limit_type=GLUI_LIMIT_CLAMP );
void set_float_val( float new_val );
- void set_double_val( double new_val );
void set_int_val( int new_val );
void set_text( const char *text );
void set_text( const GLUI_String &s) { set_text(s.c_str()); }
@@ -1655,10 +1659,6 @@ public:
GLUI_EditText( GLUI_Node *parent, const char *name,
float *live_var,
int id=-1, GLUI_CB callback=GLUI_CB() );
- // Constructor, double live variable
- GLUI_EditText( GLUI_Node *parent, const char *name,
- double *live_var,
- int id=-1, GLUI_CB callback=GLUI_CB() );
// Constructor, char* live variable
GLUI_EditText( GLUI_Node *parent, const char *name,
char *live_var,
@@ -1709,12 +1709,19 @@ protected:
/* */
/************************************************************/
-class GLUI_CommandLine : public GLUI_EditText
+class GLUIAPI GLUI_CommandLine : public GLUI_EditText
{
public:
typedef GLUI_EditText Super;
enum { HIST_SIZE = 100 };
+
+ #if _MSC_VER && (_MSC_VER < 1800)
+ // Explicit template instantiation needed for dll
+ template class GLUIAPI std::allocator<GLUI_String>;
+ template class GLUIAPI std::vector<GLUI_String, std::allocator<GLUI_String> >;
+ #endif
+
std::vector<GLUI_String> hist_list;
int curr_hist;
int oldest_hist;
@@ -1751,6 +1758,7 @@ protected:
newest_hist = 0;
commit_flag = false;
}
+
};
/************************************************************/
@@ -1759,7 +1767,7 @@ protected:
/* */
/************************************************************/
-class GLUI_RadioGroup : public GLUI_Control
+class GLUIAPI GLUI_RadioGroup : public GLUI_Control
{
public:
int num_buttons;
@@ -1796,7 +1804,7 @@ protected:
/* */
/************************************************************/
-class GLUI_RadioButton : public GLUI_Control
+class GLUIAPI GLUI_RadioButton : public GLUI_Control
{
public:
int orig_value;
@@ -1837,7 +1845,7 @@ protected:
/* */
/************************************************************/
-class GLUI_Separator : public GLUI_Control
+class GLUIAPI GLUI_Separator : public GLUI_Control
{
public:
void draw( int x, int y );
@@ -1870,7 +1878,7 @@ protected:
/* */
/************************************************************/
-class GLUI_Spinner : public GLUI_Control
+class GLUIAPI GLUI_Spinner : public GLUI_Control
{
public:
// Constructor, no live var
@@ -1882,9 +1890,6 @@ public:
// Constructor, float live var
GLUI_Spinner( GLUI_Node* parent, const char *name,
float *live_var, int id=-1, GLUI_CB callback=GLUI_CB() );
- // Constructor, double live var
- GLUI_Spinner( GLUI_Node* parent, const char *name,
- double *live_var, int id=-1, GLUI_CB callback=GLUI_CB() );
// Deprecated constructor
GLUI_Spinner( GLUI_Node* parent, const char *name,
int data_type,
@@ -1901,7 +1906,6 @@ public:
int callback_count;
int last_int_val;
float last_float_val;
- double last_double_val;
int first_callback;
float user_speed;
@@ -1921,7 +1925,6 @@ public:
void update_size( void );
void set_float_limits( float low,float high,int limit_type=GLUI_LIMIT_CLAMP);
- void set_double_limits( double low,double high,int limit_type=GLUI_LIMIT_CLAMP);
void set_int_limits( int low, int high,int limit_type=GLUI_LIMIT_CLAMP);
int find_arrow( int local_x, int local_y );
void do_drag( int x, int y );
@@ -1933,10 +1936,8 @@ public:
const char *get_text( void );
void set_float_val( float new_val );
- void set_double_val( double new_val );
void set_int_val( int new_val );
float get_float_val( void );
- double get_double_val( void );
int get_int_val( void );
void increase_growth( void );
void reset_growth( void );
@@ -1970,7 +1971,7 @@ protected:
/* */
/************************************************************/
-class GLUI_StaticText : public GLUI_Control
+class GLUIAPI GLUI_StaticText : public GLUI_Control
{
public:
void set_text( const char *text );
@@ -1996,7 +1997,7 @@ protected:
/* */
/************************************************************/
-class GLUI_TextBox : public GLUI_Control
+class GLUIAPI GLUI_TextBox : public GLUI_Control
{
public:
/* GLUI Textbox - JVK */
@@ -2099,7 +2100,7 @@ protected:
/* */
/************************************************************/
-class GLUI_List_Item : public GLUI_Node
+class GLUIAPI GLUI_List_Item : public GLUI_Node
{
public:
GLUI_String text;
@@ -2112,7 +2113,7 @@ public:
/* */
/************************************************************/
-class GLUI_List : public GLUI_Control
+class GLUIAPI GLUI_List : public GLUI_Control
{
public:
/* GLUI List - JVK */
@@ -2219,7 +2220,7 @@ protected:
/* */
/************************************************************/
-class GLUI_Scrollbar : public GLUI_Control
+class GLUIAPI GLUI_Scrollbar : public GLUI_Control
{
public:
// Constructor, no live var
@@ -2332,14 +2333,14 @@ protected:
/* */
/************************************************************/
-class GLUI_Listbox_Item : public GLUI_Node
+class GLUIAPI GLUI_Listbox_Item : public GLUI_Node
{
public:
GLUI_String text;
int id;
};
-class GLUI_Listbox : public GLUI_Control
+class GLUIAPI GLUI_Listbox : public GLUI_Control
{
public:
GLUI_String curr_text;
@@ -2409,7 +2410,7 @@ protected:
/**
This is the superclass of translation and rotation widgets.
*/
-class GLUI_Mouse_Interaction : public GLUI_Control
+class GLUIAPI GLUI_Mouse_Interaction : public GLUI_Control
{
public:
/*int get_main_area_size( void ) { return MIN( h-18, */
@@ -2455,7 +2456,7 @@ public:
An onscreen rotation controller--allows the user to interact with
a 3D rotation via a spaceball-like interface.
*/
-class GLUI_Rotation : public GLUI_Mouse_Interaction
+class GLUIAPI GLUI_Rotation : public GLUI_Mouse_Interaction
{
public:
Arcball *ball;
@@ -2510,7 +2511,7 @@ protected:
An onscreen translation controller--allows the user to interact with
a 3D translation.
*/
-class GLUI_Translation : public GLUI_Mouse_Interaction
+class GLUIAPI GLUI_Translation : public GLUI_Mouse_Interaction
{
public:
int trans_type; /* Is this an XY or a Z controller? */
diff --git a/thirdparty/glui/2.35/src/makefile b/thirdparty/glui/2.36/src/makefile
old mode 100755
new mode 100644
similarity index 90%
rename from thirdparty/glui/2.35/src/makefile
rename to thirdparty/glui/2.36/src/makefile
index 62ec91af79c94c02f1e81c0988e841da472ebff6..eb2225156e3a80ac3e3cf66b986019fa558a3dcc
--- a/thirdparty/glui/2.35/src/makefile
+++ b/thirdparty/glui/2.36/src/makefile
@@ -1,149 +1,161 @@
-.SUFFIXES: .cpp
-
-#for sgi -- comment out the lines below to use on HP
-#CC=CC -g0 -o32
-#CC=gcc
-
-# Compiler options
-OPTS=-g
-OPTS=-O0
-#OPTS=-O2
-
-UNAME = $(shell uname)
-
-ifeq ($(UNAME), Linux)
-CXX = g++
-CPPFLAGS += $(OPTS) -Wall -pedantic
-endif
-
-#######################################
-
-CPPFLAGS += -I./ -I./include
-
-LIBGLUI = -L./lib -lglui
-LIBGL = -lGLU -lGL
-LIBS = -lXmu -lXext -lX11 -lXi -lm
-
-# One of the following options only...
-
-# (1) OpenGLUT
-# LIBGLUT = -L/usr/X11R6/lib -lopenglut
-# CPPFLAGS += -I/usr/X11R6/include -DGLUI_OPENGLUT
-
-# (2) FreeGLUT
-# LIBGLUT = -L/usr/X11R6/lib -lfreeglut
-# CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT
-
-# (3) GLUT
-LIBGLUT = -framework OpenGL -framework GLUT
-#LIBGLUT = -L/usr/X11R6/lib -lglut
-CPPFLAGS += -I/usr/X11R6/include
-
-#######################################
-
-GLUI_OBJS = glui_add_controls.o glui_string.o glui.o glui_bitmap_img_data.o glui_bitmaps.o glui_button.o glui_edittext.o glui_commandline.o glui_checkbox.o glui_node.o glui_radio.o glui_statictext.o glui_panel.o glui_separator.o glui_spinner.o glui_control.o glui_column.o glui_translation.o glui_rotation.o glui_mouse_iaction.o glui_listbox.o glui_rollout.o glui_window.o arcball.o algebra3.o quaternion.o viewmodel.o glui_treepanel.o glui_tree.o glui_textbox.o glui_scrollbar.o glui_list.o glui_filebrowser.o
-
-GLUI_LIB = lib/libglui.a
-
-GLUI_EXAMPLES = bin/example1 bin/example2 bin/example3 bin/example4 bin/example5 bin/example6
-
-GLUI_TOOLS = bin/ppm2array
-
-.PHONY: all setup examples tools clean depend dist
-
-all: setup $(GLUI_LIB) examples tools
-
-setup:
- mkdir -p bin
- mkdir -p lib
-
-examples: $(GLUI_EXAMPLES)
-
-tools: $(GLUI_TOOLS)
-
-bin/ppm2array: tools/ppm2array.cpp tools/ppm.cpp
- $(CXX) $(CPPFLAGS) -o $@ $^
-
-bin/%: example/%.cpp $(GLUI_LIB)
- $(CXX) $(CPPFLAGS) -o $@ $< $(LIBGLUI) $(LIBGLUT) $(LIBGL) $(LIBS)
-
-$(GLUI_LIB): $(GLUI_OBJS)
- ar -r $(GLUI_LIB) $(GLUI_OBJS)
-
-.cpp.o:
- $(CXX) $(CPPFLAGS) -c $<
-
-.c.o:
- $(CXX) $(CPPFLAGS) -c $<
-
-docs:
- doxygen doc/doxygen.cfg
-
-clean:
- rm -f *.o $(GLUI_LIB) $(GLUI_EXAMPLES) $(GLUI_TOOLS)
- rm -fr doc/html
-
-depend:
- makedepend -Y./include `find -name "*.cpp"` `find -name "*.c"`
-
-DIST = glui-2.3.0
-
-dist: clean
- mkdir -p $(DIST)
- cp --parents \
- `find -type f -name "*.cpp"` \
- `find -type f -name "*.c"` \
- `find -type f -name "*.h"` \
- `find -type f -name "*.dev"` \
- `find -type f -name "*.dsp"` \
- `find -type f -name "*.dsw"` \
- `find -type f -name "*.vcproj"` \
- `find -type f -name "*.sln"` \
- `find -type f -name "*.txt"` \
- makefile \
- $(DIST)
- tar cv $(DIST) | gzip -9 - > $(DIST).tgz
- rm -Rf $(DIST)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-./algebra3.o: algebra3.h glui_internal.h
-./arcball.o: arcball.h glui_internal.h algebra3.h quaternion.h
-./glui_button.o: ./include/GL/glui.h glui_internal.h
-./glui_checkbox.o: ./include/GL/glui.h glui_internal.h
-./glui_column.o: ./include/GL/glui.h glui_internal.h
-./glui_control.o: ./include/GL/glui.h glui_internal.h
-./glui_edittext.o: ./include/GL/glui.h glui_internal.h
-./glui_listbox.o: ./include/GL/glui.h glui_internal.h
-./glui_mouse_iaction.o: ./include/GL/glui.h glui_internal.h
-./glui_node.o: ./include/GL/glui.h glui_internal.h
-./glui_panel.o: ./include/GL/glui.h glui_internal.h
-./glui_radio.o: ./include/GL/glui.h glui_internal.h
-./glui_rollout.o: ./include/GL/glui.h glui_internal.h
-./glui_rotation.o: ./include/GL/glui.h arcball.h glui_internal.h algebra3.h
-./glui_rotation.o: quaternion.h
-./glui_separator.o: ./include/GL/glui.h glui_internal.h
-./glui_spinner.o: ./include/GL/glui.h glui_internal.h
-./glui_translation.o: ./include/GL/glui.h glui_internal.h algebra3.h
-./glui_window.o: ./include/GL/glui.h glui_internal.h
-./quaternion.o: quaternion.h algebra3.h glui_internal.h
-./viewmodel.o: viewmodel.h algebra3.h ./include/GL/glui.h
-./glui_bitmaps.o: ./include/GL/glui.h glui_internal.h
-./glui_statictext.o: ./include/GL/glui.h glui_internal.h
-./glui.o: ./include/GL/glui.h glui_internal.h
-./glui_add_controls.o: ./include/GL/glui.h glui_internal.h
-./glui_commandline.o: ./include/GL/glui.h glui_internal.h
-./glui_list.o: ./include/GL/glui.h glui_internal.h
-./glui_scrollbar.o: ./include/GL/glui.h glui_internal.h
-./glui_string.o: ./include/GL/glui.h
-./glui_textbox.o: ./include/GL/glui.h glui_internal.h
-./glui_tree.o: ./include/GL/glui.h glui_internal.h
-./glui_treepanel.o: ./include/GL/glui.h
-./example/example1.o: ./include/GL/glui.h
-./example/example2.o: ./include/GL/glui.h
-./example/example3.o: ./include/GL/glui.h
-./example/example4.o: ./include/GL/glui.h
-./example/example5.o: ./include/GL/glui.h
-./example/example6.o: ./include/GL/glui.h
-./tools/ppm2array.o: ./tools/ppm.hpp
-./glui_filebrowser.o: ./include/GL/glui.h glui_internal.h
+.SUFFIXES: .cpp
+
+#for sgi -- comment out the lines below to use on HP
+#CC=CC -g0 -o32
+#CC=gcc
+
+# Compiler options
+OPTS=-g
+OPTS=-O0
+#OPTS=-O2
+
+UNAME = $(shell uname)
+
+ifeq ($(UNAME), Linux)
+CXX = g++
+CPPFLAGS += $(OPTS) -Wall -pedantic
+endif
+
+#######################################
+
+CPPFLAGS += -I./ -I./include
+
+LIBGLUI = -L./lib -lglui
+LIBGL = -lGLU -lGL
+LIBS = -lXmu -lXext -lX11 -lXi -lm
+
+# One of the following options only...
+
+# (1) OpenGLUT
+# LIBGLUT = -L/usr/X11R6/lib -lopenglut
+# CPPFLAGS += -I/usr/X11R6/include -DGLUI_OPENGLUT
+
+# (2) FreeGLUT
+# LIBGLUT = -L/usr/X11R6/lib -lfreeglut
+# CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT
+
+# (3) GLUT
+LIBGLUT = -L/usr/X11R6/lib -lglut
+CPPFLAGS += -I/usr/X11R6/include
+
+#######################################
+
+GLUI_OBJS = glui_add_controls.o glui_string.o glui.o glui_bitmap_img_data.o glui_bitmaps.o glui_button.o glui_edittext.o glui_commandline.o glui_checkbox.o glui_node.o glui_radio.o glui_statictext.o glui_panel.o glui_separator.o glui_spinner.o glui_control.o glui_column.o glui_translation.o glui_rotation.o glui_mouse_iaction.o glui_listbox.o glui_rollout.o glui_window.o arcball.o algebra3.o quaternion.o viewmodel.o glui_treepanel.o glui_tree.o glui_textbox.o glui_scrollbar.o glui_list.o glui_filebrowser.o
+
+GLUI_LIB = lib/libglui.a
+
+GLUI_EXAMPLES = bin/example1 bin/example2 bin/example3 bin/example4 bin/example5 bin/example6
+
+GLUI_TOOLS = bin/ppm2array
+
+.PHONY: all setup examples tools clean depend doc doc-pdf doc-dist dist
+
+all: setup $(GLUI_LIB) examples tools
+
+setup:
+ mkdir -p bin
+ mkdir -p lib
+
+examples: $(GLUI_EXAMPLES)
+
+tools: $(GLUI_TOOLS)
+
+bin/ppm2array: tools/ppm2array.cpp tools/ppm.cpp
+ $(CXX) $(CPPFLAGS) -o $@ $^
+
+bin/%: example/%.cpp $(GLUI_LIB)
+ $(CXX) $(CPPFLAGS) -o $@ $< $(LIBGLUI) $(LIBGLUT) $(LIBGL) $(LIBS)
+
+$(GLUI_LIB): $(GLUI_OBJS)
+ ar -r $(GLUI_LIB) $(GLUI_OBJS)
+
+.cpp.o:
+ $(CXX) $(CPPFLAGS) -c $<
+
+.c.o:
+ $(CXX) $(CPPFLAGS) -c $<
+
+docs:
+ doxygen doc/doxygen.cfg
+
+clean:
+ rm -f *.o $(GLUI_LIB) $(GLUI_EXAMPLES) $(GLUI_TOOLS)
+ rm -fr doc/doxygen
+
+depend:
+ makedepend -Y./include `find -name "*.cpp"` `find -name "*.c"`
+
+DIST = glui-2.35
+
+doc:
+ doxygen doc/doxygen.cfg
+
+doc-pdf:
+ cd doc/doxygen/latex && pdflatex refman.tex && pdflatex refman.tex && pdflatex refman.tex
+
+doc-dist:
+ mkdir -p $(DIST)/doc
+ cp `find doc/doxygen/html -type f` $(DIST)/doc
+ tar cv $(DIST) | gzip -9 - > $(DIST)-doc.tgz
+ zip -vr9 $(DIST)-doc.zip $(DIST)
+ rm -Rf $(DIST)
+
+dist: clean
+ mkdir -p $(DIST)
+ cp --parents \
+ `find -type f -name "*.cpp"` \
+ `find -type f -name "*.c"` \
+ `find -type f -name "*.h"` \
+ `find -type f -name "*.dev"` \
+ `find -type f -name "*.dsp"` \
+ `find -type f -name "*.dsw"` \
+ `find -type f -name "*.vcproj"` \
+ `find -type f -name "*.sln"` \
+ `find -type f -name "*.txt"` \
+ makefile \
+ $(DIST)
+ tar cv $(DIST) | gzip -9 - > $(DIST).tgz
+ rm -Rf $(DIST)
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+./algebra3.o: algebra3.h glui_internal.h
+./arcball.o: arcball.h glui_internal.h algebra3.h quaternion.h
+./glui_button.o: ./include/GL/glui.h glui_internal.h
+./glui_checkbox.o: ./include/GL/glui.h glui_internal.h
+./glui_column.o: ./include/GL/glui.h glui_internal.h
+./glui_control.o: ./include/GL/glui.h glui_internal.h
+./glui_edittext.o: ./include/GL/glui.h glui_internal.h
+./glui_listbox.o: ./include/GL/glui.h glui_internal.h
+./glui_mouse_iaction.o: ./include/GL/glui.h glui_internal.h
+./glui_node.o: ./include/GL/glui.h glui_internal.h
+./glui_panel.o: ./include/GL/glui.h glui_internal.h
+./glui_radio.o: ./include/GL/glui.h glui_internal.h
+./glui_rollout.o: ./include/GL/glui.h glui_internal.h
+./glui_rotation.o: ./include/GL/glui.h arcball.h glui_internal.h algebra3.h
+./glui_rotation.o: quaternion.h
+./glui_separator.o: ./include/GL/glui.h glui_internal.h
+./glui_spinner.o: ./include/GL/glui.h glui_internal.h
+./glui_translation.o: ./include/GL/glui.h glui_internal.h algebra3.h
+./glui_window.o: ./include/GL/glui.h glui_internal.h
+./quaternion.o: quaternion.h algebra3.h glui_internal.h
+./viewmodel.o: viewmodel.h algebra3.h ./include/GL/glui.h
+./glui_bitmaps.o: ./include/GL/glui.h glui_internal.h
+./glui_statictext.o: ./include/GL/glui.h glui_internal.h
+./glui.o: ./include/GL/glui.h glui_internal.h
+./glui_add_controls.o: ./include/GL/glui.h glui_internal.h
+./glui_commandline.o: ./include/GL/glui.h glui_internal.h
+./glui_list.o: ./include/GL/glui.h glui_internal.h
+./glui_scrollbar.o: ./include/GL/glui.h glui_internal.h
+./glui_string.o: ./include/GL/glui.h
+./glui_textbox.o: ./include/GL/glui.h glui_internal.h
+./glui_tree.o: ./include/GL/glui.h glui_internal.h
+./glui_treepanel.o: ./include/GL/glui.h
+./example/example1.o: ./include/GL/glui.h
+./example/example2.o: ./include/GL/glui.h
+./example/example3.o: ./include/GL/glui.h
+./example/example4.o: ./include/GL/glui.h
+./example/example5.o: ./include/GL/glui.h
+./example/example6.o: ./include/GL/glui.h
+./tools/ppm2array.o: ./tools/ppm.hpp
+./glui_filebrowser.o: ./include/GL/glui.h glui_internal.h
diff --git a/thirdparty/glui/2.36/src/msvc/README.txt b/thirdparty/glui/2.36/src/msvc/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b96498c76a64a1c3e299f7f97eab0d22ed23df84
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/README.txt
@@ -0,0 +1,94 @@
+About the GLUI Project Files for Microsoft Visual Studio.
+
+
+----------------------------------------
+Microsoft Visual Studio 7.1
+----------------------------------------
+
+Using these project files you can build four different versions of
+glui:
+
+=== Release ===
+
+ - static GLUI library, debug symbols off, optimizations on
+ - outputs lib\glui32.lib
+
+ - To use in your program:
+
+ The lib should link in automatically if you include glui.h
+ thanks to a #pragma comment(lib...) statement.
+
+=== Debug ===
+
+ - static GLUI library, debug symbols on, optimizations off
+ - outputs lib\glui32d.lib
+
+ - To use in your program:
+
+ Define preprocessor symbols: NO_GLUI_LIB_PRAGMA
+ Add to the list of input libs: glui32d.lib
+
+=== Release GLUIDLL ===
+
+ - dynamic GLUI library, debug symbols off, optimizations on
+ - outputs lib\glui32dll.lib and bin\glui32dll.dll
+
+ - To use in your program:
+
+ Define the preprocessor symbol: GLUIDLL
+ Then the dll should link in automatically if you include glui.h
+ thanks to a #pragma comment(lib...) statement.
+
+=== Debug GLUIDLL ===
+
+ - dynamic GLUI library, debug symbols on, optimizations off
+ - outputs lib\glui32dlld.lib and bin\glui32dlld.dll
+
+ - To use in your program:
+
+ Define preprocessor symbols: NO_GLUI_LIB_PRAGMA;GLUIDLL
+ Add to the list of input libs: glui32dlld.lib
+
+
+To build the examples, you need to build the libraries first, then the
+examples (no automatic dependencies are set up in the solution file).
+
+If you're lazy, you can just batch build everything twice. (Some
+examples will fail to link the first time through because not all the
+libraries have been built yet, but the second time through everything
+should link.)
+
+The examples are set up in pretty much the way you would need to set
+them up in your own programs in terms of preprocessor defines and extra
+libraries in the list of link libs. However, you will probably only want
+to link with either glui32.lib or glui32dll.lib in your programs. The debug
+versions are only useful if you want to debug GLUI itself.
+
+
+RUNNING GLUIDLL EXAMPLES:
+
+To make the GLUIDLL examples run from within Visual Studio you may need to
+change the working directory on the example projects to "bin":
+
+ Properties -> Debugging -> Working Directory
+
+
+Unfortunately Microsoft considers this setting "user-specific" rather
+than "project-specific" and so doesn't save it in the main project or
+solution files.
+
+
+----------------------------------------
+Microsoft Visual Studio 8.0
+----------------------------------------
+
+Visual Studio 8 should be able to convert the 7.1 project files automatically.
+
+----------------------------------------
+Microsoft Visual Studio 6.0
+----------------------------------------
+
+These project files are out of date.
+
+We are looking for any volunteers who still use MSVC 6.0 to maintain
+these files.
\ No newline at end of file
diff --git a/thirdparty/glui/2.35/src/msvc/example1.dsp b/thirdparty/glui/2.36/src/msvc/example1.dsp
old mode 100755
new mode 100644
similarity index 97%
rename from thirdparty/glui/2.35/src/msvc/example1.dsp
rename to thirdparty/glui/2.36/src/msvc/example1.dsp
index d1ac9ad7d80ead8e97a303642b0974f16cd2f5e8..ab3536dc1dc278aad0d494dcb672ffb2c23601d0
--- a/thirdparty/glui/2.35/src/msvc/example1.dsp
+++ b/thirdparty/glui/2.36/src/msvc/example1.dsp
@@ -1,90 +1,90 @@
-# Microsoft Developer Studio Project File - Name="example1" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=example1 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "example1.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "example1.mak" CFG="example1 - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "example1 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "example1 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "example1 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example1.exe"
-
-!ELSEIF "$(CFG)" == "example1 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example1d.exe" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "example1 - Win32 Release"
-# Name "example1 - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\example\example1.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="example1" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=example1 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "example1.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "example1.mak" CFG="example1 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "example1 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example1 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "example1 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example1.exe"
+
+!ELSEIF "$(CFG)" == "example1 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example1d.exe" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "example1 - Win32 Release"
+# Name "example1 - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\example\example1.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.36/src/msvc/example1.vcproj b/thirdparty/glui/2.36/src/msvc/example1.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..2f66cc9e8e097c834772106832621308feaf2e10
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/example1.vcproj
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="example1"
+ ProjectGUID="{7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}"
+ RootNamespace="example1"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example1.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example1.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example1.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example1.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32d.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example1d.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example1.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug GLUIDLL|Win32"
+ OutputDirectory="DebugDLL"
+ IntermediateDirectory="DebugDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA;GLUIDLL"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example1.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32dlld.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example1dlld.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example1.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release GLUIDLL|Win32"
+ OutputDirectory="ReleaseDLL"
+ IntermediateDirectory="ReleaseDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUIDLL"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example1.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example1dll.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example1.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\example\example1.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example2.dsp b/thirdparty/glui/2.36/src/msvc/example2.dsp
old mode 100755
new mode 100644
similarity index 97%
rename from thirdparty/glui/2.35/src/msvc/example2.dsp
rename to thirdparty/glui/2.36/src/msvc/example2.dsp
index 6eebec74995922a53c4a3e4527b3dbfa2565d2f1..de537890ca23ee3ea572383a3f516b26e916f7aa
--- a/thirdparty/glui/2.35/src/msvc/example2.dsp
+++ b/thirdparty/glui/2.36/src/msvc/example2.dsp
@@ -1,90 +1,90 @@
-# Microsoft Developer Studio Project File - Name="example2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=example2 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "example2.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "example2.mak" CFG="example2 - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "example2 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "example2 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "example2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example2.exe"
-
-!ELSEIF "$(CFG)" == "example2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example2d.exe" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "example2 - Win32 Release"
-# Name "example2 - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\example\example2.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="example2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=example2 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "example2.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "example2.mak" CFG="example2 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "example2 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example2 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "example2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example2.exe"
+
+!ELSEIF "$(CFG)" == "example2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example2d.exe" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "example2 - Win32 Release"
+# Name "example2 - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\example\example2.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.36/src/msvc/example2.vcproj b/thirdparty/glui/2.36/src/msvc/example2.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..5b7494e69628f7ebf116dceee590eb3782a66520
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/example2.vcproj
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="example2"
+ ProjectGUID="{10FB199D-975A-4320-A09A-570C0E8A7890}"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example2.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example2.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example2.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example2.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32d.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example2d.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example2.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug GLUIDLL|Win32"
+ OutputDirectory="DebugDLL"
+ IntermediateDirectory="DebugDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA;GLUIDLL"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example2.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32dlld.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example2dlld.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example2.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release GLUIDLL|Win32"
+ OutputDirectory="ReleaseDLL"
+ IntermediateDirectory="ReleaseDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUIDLL"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example2.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example2dll.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example2.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\example\example2.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example3.dsp b/thirdparty/glui/2.36/src/msvc/example3.dsp
old mode 100755
new mode 100644
similarity index 97%
rename from thirdparty/glui/2.35/src/msvc/example3.dsp
rename to thirdparty/glui/2.36/src/msvc/example3.dsp
index 709e6863c19fcd2ae9b37e77ae5fdcd0f996060c..c6832966fd2f8f1848b420d08d0547a804933609
--- a/thirdparty/glui/2.35/src/msvc/example3.dsp
+++ b/thirdparty/glui/2.36/src/msvc/example3.dsp
@@ -1,90 +1,90 @@
-# Microsoft Developer Studio Project File - Name="example3" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=example3 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "example3.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "example3.mak" CFG="example3 - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "example3 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "example3 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "example3 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example3.exe"
-
-!ELSEIF "$(CFG)" == "example3 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example3d.exe" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "example3 - Win32 Release"
-# Name "example3 - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\example\example3.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="example3" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=example3 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "example3.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "example3.mak" CFG="example3 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "example3 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example3 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "example3 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example3.exe"
+
+!ELSEIF "$(CFG)" == "example3 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example3d.exe" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "example3 - Win32 Release"
+# Name "example3 - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\example\example3.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.36/src/msvc/example3.vcproj b/thirdparty/glui/2.36/src/msvc/example3.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..8adcc6573bbab06fe1ed63d64453e3851338bcba
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/example3.vcproj
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="example3"
+ ProjectGUID="{A0DFF582-F13B-4CFB-95CE-A026A503BDD8}"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32d.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example3d.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example3.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="../include"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example3.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example3.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug GLUIDLL|Win32"
+ OutputDirectory="DebugDLL"
+ IntermediateDirectory="DebugDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA;GLUIDLL"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32dlld.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example3dlld.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example3.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release GLUIDLL|Win32"
+ OutputDirectory="ReleaseDLL"
+ IntermediateDirectory="ReleaseDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUIDLL"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example3dll.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example3.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\example\example3.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example4.dsp b/thirdparty/glui/2.36/src/msvc/example4.dsp
old mode 100755
new mode 100644
similarity index 97%
rename from thirdparty/glui/2.35/src/msvc/example4.dsp
rename to thirdparty/glui/2.36/src/msvc/example4.dsp
index 45989a62350de463ab4beaf2e8495a91579eb737..3c529f642f41bf08cf9dba031c987ab05c47d8a0
--- a/thirdparty/glui/2.35/src/msvc/example4.dsp
+++ b/thirdparty/glui/2.36/src/msvc/example4.dsp
@@ -1,90 +1,90 @@
-# Microsoft Developer Studio Project File - Name="example4" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=example4 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Example4.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Example4.mak" CFG="example4 - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "example4 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "example4 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "example4 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example4.exe"
-
-!ELSEIF "$(CFG)" == "example4 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example4d.exe" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "example4 - Win32 Release"
-# Name "example4 - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\example\example4.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="example4" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=example4 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Example4.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "Example4.mak" CFG="example4 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "example4 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example4 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "example4 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example4.exe"
+
+!ELSEIF "$(CFG)" == "example4 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example4d.exe" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "example4 - Win32 Release"
+# Name "example4 - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\example\example4.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.36/src/msvc/example4.vcproj b/thirdparty/glui/2.36/src/msvc/example4.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..a996058d1603db379862162c9341785f36362c78
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/example4.vcproj
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="example4"
+ ProjectGUID="{DE98CD9A-9830-46F8-835D-FB4D82182A7C}"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example4.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32d.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example4d.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example4.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example4.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example4.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example4.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug GLUIDLL|Win32"
+ OutputDirectory="DebugDLL"
+ IntermediateDirectory="DebugDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA;GLUIDLL"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/example4.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32dlld.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example4dlld.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/example4.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release GLUIDLL|Win32"
+ OutputDirectory="ReleaseDLL"
+ IntermediateDirectory="ReleaseDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUIDLL"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/example4.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example4dll.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example4.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\example\example4.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example5.dsp b/thirdparty/glui/2.36/src/msvc/example5.dsp
old mode 100755
new mode 100644
similarity index 97%
rename from thirdparty/glui/2.35/src/msvc/example5.dsp
rename to thirdparty/glui/2.36/src/msvc/example5.dsp
index 59d71d5ef4e7e10cf5f8aabd74fdb253d5228913..6382b7e21ec6cc91a9536b6dd6a39668ee571f2f
--- a/thirdparty/glui/2.35/src/msvc/example5.dsp
+++ b/thirdparty/glui/2.36/src/msvc/example5.dsp
@@ -1,90 +1,90 @@
-# Microsoft Developer Studio Project File - Name="example5" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=example5 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "example5.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "example5.mak" CFG="example5 - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "example5 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "example5 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "example5 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example5.exe"
-
-!ELSEIF "$(CFG)" == "example5 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "example5"
-# PROP BASE Intermediate_Dir "example5"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "example5"
-# PROP Intermediate_Dir "example5"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example5d.exe" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "example5 - Win32 Release"
-# Name "example5 - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\example\example5.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="example5" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=example5 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "example5.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "example5.mak" CFG="example5 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "example5 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example5 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "example5 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example5.exe"
+
+!ELSEIF "$(CFG)" == "example5 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "example5"
+# PROP BASE Intermediate_Dir "example5"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "example5"
+# PROP Intermediate_Dir "example5"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example5d.exe" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "example5 - Win32 Release"
+# Name "example5 - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\example\example5.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.36/src/msvc/example5.vcproj b/thirdparty/glui/2.36/src/msvc/example5.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..99d3fd43560a6f752debe8eec56099b86bf3d0a5
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/example5.vcproj
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="example5"
+ ProjectGUID="{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
+ RootNamespace="example5"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin/example5.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example5.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32d.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example5d.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\example5/example5.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug GLUIDLL|Win32"
+ OutputDirectory="DebugDLL"
+ IntermediateDirectory="DebugDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA;GLUIDLL"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32dlld.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example5dlld.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\example5/example5.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release GLUIDLL|Win32"
+ OutputDirectory="ReleaseDLL"
+ IntermediateDirectory="ReleaseDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUIDLL"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin/example5dll.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example5.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\example\example5.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/example6.dsp b/thirdparty/glui/2.36/src/msvc/example6.dsp
old mode 100755
new mode 100644
similarity index 97%
rename from thirdparty/glui/2.35/src/msvc/example6.dsp
rename to thirdparty/glui/2.36/src/msvc/example6.dsp
index 4cbfd0a395c43b7712a45becb035b83fd9e8479b..6c3c37c92d7c088bcc3bf763e687b78bea0e2b2c
--- a/thirdparty/glui/2.35/src/msvc/example6.dsp
+++ b/thirdparty/glui/2.36/src/msvc/example6.dsp
@@ -1,90 +1,90 @@
-# Microsoft Developer Studio Project File - Name="example6" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=example6 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "example6.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "example6.mak" CFG="example6 - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "example6 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "example6 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "example6 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example6.exe"
-
-!ELSEIF "$(CFG)" == "example6 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "example6"
-# PROP BASE Intermediate_Dir "example6"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "example6"
-# PROP Intermediate_Dir "example6"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example6d.exe" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "example6 - Win32 Release"
-# Name "example6 - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\example\example6.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="example6" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=example6 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "example6.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "example6.mak" CFG="example6 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "example6 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "example6 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "example6 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/example6.exe"
+
+!ELSEIF "$(CFG)" == "example6 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "example6"
+# PROP BASE Intermediate_Dir "example6"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "example6"
+# PROP Intermediate_Dir "example6"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "GLUI_NO_LIB_PRAGMA" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/example6d.exe" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "example6 - Win32 Release"
+# Name "example6 - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\example\example6.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.36/src/msvc/example6.vcproj b/thirdparty/glui/2.36/src/msvc/example6.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..d143f9cd409459beaeb1efae05920e6511d23c3e
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/example6.vcproj
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="example6"
+ ProjectGUID="{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin/example6.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example6.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32d.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example6d.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\example6/example6.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug GLUIDLL|Win32"
+ OutputDirectory="DebugDLL"
+ IntermediateDirectory="DebugDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUI_NO_LIB_PRAGMA;GLUIDLL"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glui32dlld.lib glut32.lib glu32.lib opengl32.lib odbc32.lib odbccp32.lib"
+ OutputFile="bin/example6dlld.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\example6/example6.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release GLUIDLL|Win32"
+ OutputDirectory="ReleaseDLL"
+ IntermediateDirectory="ReleaseDLL"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="GLUIDLL"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin/example6dll.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="lib"
+ ProgramDatabaseFile="$(OutDir)/$(InputName).pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/example6.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\example\example6.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release GLUIDLL|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/glui.dsp b/thirdparty/glui/2.36/src/msvc/glui.dsp
old mode 100755
new mode 100644
similarity index 95%
rename from thirdparty/glui/2.35/src/msvc/glui.dsp
rename to thirdparty/glui/2.36/src/msvc/glui.dsp
index 84f771ecb4c4225a3af1394dd9e7e26fcf37cb34..34941acf6244fc162e69beb3d00b60dfde55fa30
--- a/thirdparty/glui/2.35/src/msvc/glui.dsp
+++ b/thirdparty/glui/2.36/src/msvc/glui.dsp
@@ -1,216 +1,216 @@
-# Microsoft Developer Studio Project File - Name="GLUI" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=GLUI - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "GLUI.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "GLUI.mak" CFG="GLUI - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "GLUI - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "GLUI - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "GLUI - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"lib\glui32.lib"
-
-!ELSEIF "$(CFG)" == "GLUI - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GR /GX /Z7 /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\glui32.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "GLUI - Win32 Release"
-# Name "GLUI - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\algebra3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\arcball.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_add_controls.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_bitmap_img_data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_bitmaps.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_button.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_checkbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_column.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_commandline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_control.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_edittext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_filebrowser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_list.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_listbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_mouse_iaction.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_node.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_panel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_radio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_rollout.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_rotation.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_scrollbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_separator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_spinner.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_statictext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_string.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_textbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_translation.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_tree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_treepanel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\glui_window.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\quaternion.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="GLUI" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=GLUI - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "GLUI.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "GLUI.mak" CFG="GLUI - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "GLUI - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "GLUI - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "GLUI - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"lib\glui32.lib"
+
+!ELSEIF "$(CFG)" == "GLUI - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GR /GX /Z7 /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug\glui32.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "GLUI - Win32 Release"
+# Name "GLUI - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\algebra3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\arcball.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_add_controls.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_bitmap_img_data.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_bitmaps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_button.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_checkbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_column.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_commandline.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_control.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_edittext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_filebrowser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_list.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_listbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_mouse_iaction.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_node.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_panel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_radio.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_rollout.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_rotation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_scrollbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_separator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_spinner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_statictext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_string.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_textbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_translation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_tree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_treepanel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\glui_window.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\quaternion.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.35/src/msvc/glui.dsw b/thirdparty/glui/2.36/src/msvc/glui.dsw
old mode 100755
new mode 100644
similarity index 94%
rename from thirdparty/glui/2.35/src/msvc/glui.dsw
rename to thirdparty/glui/2.36/src/msvc/glui.dsw
index 21be6ba8774e10238c12015d76d6d0dea3860e29..c664b703444152d53da71c6f3d7eeae20bc11a97
--- a/thirdparty/glui/2.35/src/msvc/glui.dsw
+++ b/thirdparty/glui/2.36/src/msvc/glui.dsw
@@ -1,131 +1,131 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "GLUI"=".\glui.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "example1"=.\example1.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name GLUI
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "example2"=.\example2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name GLUI
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "example3"=.\example3.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name GLUI
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "example4"=.\Example4.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name GLUI
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "example5"=.\example5.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name GLUI
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "example6"=.\example6.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name GLUI
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ppm2array"=.\ppm2array.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "GLUI"=".\glui.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "example1"=.\example1.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name GLUI
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "example2"=.\example2.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name GLUI
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "example3"=.\example3.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name GLUI
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "example4"=.\Example4.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name GLUI
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "example5"=.\example5.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name GLUI
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "example6"=.\example6.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name GLUI
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ppm2array"=.\ppm2array.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/thirdparty/glui/2.35/src/msvc/glui.sln b/thirdparty/glui/2.36/src/msvc/glui.sln
old mode 100755
new mode 100644
similarity index 50%
rename from thirdparty/glui/2.35/src/msvc/glui.sln
rename to thirdparty/glui/2.36/src/msvc/glui.sln
index e4ee4713e7d0e22db00d8848a00a1c8dbb1f0d73..810f65b7ddd51f2bd455e5ef9198b01fc21e23c3
--- a/thirdparty/glui/2.35/src/msvc/glui.sln
+++ b/thirdparty/glui/2.36/src/msvc/glui.sln
@@ -1,75 +1,114 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLUI", "glui.vcproj", "{304505FF-4A2A-471E-B163-17446985C98E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example1", "example1.vcproj", "{7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}"
- ProjectSection(ProjectDependencies) = postProject
- {304505FF-4A2A-471E-B163-17446985C98E} = {304505FF-4A2A-471E-B163-17446985C98E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example2", "example2.vcproj", "{10FB199D-975A-4320-A09A-570C0E8A7890}"
- ProjectSection(ProjectDependencies) = postProject
- {304505FF-4A2A-471E-B163-17446985C98E} = {304505FF-4A2A-471E-B163-17446985C98E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example3", "example3.vcproj", "{A0DFF582-F13B-4CFB-95CE-A026A503BDD8}"
- ProjectSection(ProjectDependencies) = postProject
- {304505FF-4A2A-471E-B163-17446985C98E} = {304505FF-4A2A-471E-B163-17446985C98E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example4", "example4.vcproj", "{DE98CD9A-9830-46F8-835D-FB4D82182A7C}"
- ProjectSection(ProjectDependencies) = postProject
- {304505FF-4A2A-471E-B163-17446985C98E} = {304505FF-4A2A-471E-B163-17446985C98E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example5", "example5.vcproj", "{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
- ProjectSection(ProjectDependencies) = postProject
- {304505FF-4A2A-471E-B163-17446985C98E} = {304505FF-4A2A-471E-B163-17446985C98E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example6", "example6.vcproj", "{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
- ProjectSection(ProjectDependencies) = postProject
- {304505FF-4A2A-471E-B163-17446985C98E} = {304505FF-4A2A-471E-B163-17446985C98E}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {304505FF-4A2A-471E-B163-17446985C98E}.Debug.ActiveCfg = Debug|Win32
- {304505FF-4A2A-471E-B163-17446985C98E}.Debug.Build.0 = Debug|Win32
- {304505FF-4A2A-471E-B163-17446985C98E}.Release.ActiveCfg = Release|Win32
- {304505FF-4A2A-471E-B163-17446985C98E}.Release.Build.0 = Release|Win32
- {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Debug.ActiveCfg = Debug|Win32
- {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Debug.Build.0 = Debug|Win32
- {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Release.ActiveCfg = Release|Win32
- {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Release.Build.0 = Release|Win32
- {10FB199D-975A-4320-A09A-570C0E8A7890}.Debug.ActiveCfg = Debug|Win32
- {10FB199D-975A-4320-A09A-570C0E8A7890}.Debug.Build.0 = Debug|Win32
- {10FB199D-975A-4320-A09A-570C0E8A7890}.Release.ActiveCfg = Release|Win32
- {10FB199D-975A-4320-A09A-570C0E8A7890}.Release.Build.0 = Release|Win32
- {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Debug.ActiveCfg = Debug|Win32
- {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Debug.Build.0 = Debug|Win32
- {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Release.ActiveCfg = Release|Win32
- {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Release.Build.0 = Release|Win32
- {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Debug.ActiveCfg = Debug|Win32
- {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Debug.Build.0 = Debug|Win32
- {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Release.ActiveCfg = Release|Win32
- {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Release.Build.0 = Release|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.ActiveCfg = Debug|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.Build.0 = Debug|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.ActiveCfg = Release|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.Build.0 = Release|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.ActiveCfg = Debug|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.Build.0 = Debug|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.ActiveCfg = Release|Win32
- {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_glui library", "glui.vcproj", "{304505FF-4A2A-471E-B163-17446985C98E}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example1", "example1.vcproj", "{7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example2", "example2.vcproj", "{10FB199D-975A-4320-A09A-570C0E8A7890}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example3", "example3.vcproj", "{A0DFF582-F13B-4CFB-95CE-A026A503BDD8}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example4", "example4.vcproj", "{DE98CD9A-9830-46F8-835D-FB4D82182A7C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example5", "example5.vcproj", "{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example6", "example6.vcproj", "{7574E15F-58D0-41DD-8EC2-D8EED683230F}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_gluidll library", "gluidll.vcproj", "{5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Debug GLUIDLL = Debug GLUIDLL
+ Release = Release
+ Release GLUIDLL = Release GLUIDLL
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {304505FF-4A2A-471E-B163-17446985C98E}.Debug.ActiveCfg = Debug|Win32
+ {304505FF-4A2A-471E-B163-17446985C98E}.Debug.Build.0 = Debug|Win32
+ {304505FF-4A2A-471E-B163-17446985C98E}.Debug GLUIDLL.ActiveCfg = Debug|Win32
+ {304505FF-4A2A-471E-B163-17446985C98E}.Debug GLUIDLL.Build.0 = Debug|Win32
+ {304505FF-4A2A-471E-B163-17446985C98E}.Release.ActiveCfg = Release|Win32
+ {304505FF-4A2A-471E-B163-17446985C98E}.Release.Build.0 = Release|Win32
+ {304505FF-4A2A-471E-B163-17446985C98E}.Release GLUIDLL.ActiveCfg = Release|Win32
+ {304505FF-4A2A-471E-B163-17446985C98E}.Release GLUIDLL.Build.0 = Release|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Debug.ActiveCfg = Debug|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Debug.Build.0 = Debug|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Debug GLUIDLL.ActiveCfg = Debug GLUIDLL|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Debug GLUIDLL.Build.0 = Debug GLUIDLL|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Release.ActiveCfg = Release|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Release.Build.0 = Release|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Release GLUIDLL.ActiveCfg = Release GLUIDLL|Win32
+ {7DE9C1DC-6293-49CE-AC29-AADE92D03ADC}.Release GLUIDLL.Build.0 = Release GLUIDLL|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Debug.ActiveCfg = Debug|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Debug.Build.0 = Debug|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Debug GLUIDLL.ActiveCfg = Debug GLUIDLL|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Debug GLUIDLL.Build.0 = Debug GLUIDLL|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Release.ActiveCfg = Release|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Release.Build.0 = Release|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Release GLUIDLL.ActiveCfg = Release GLUIDLL|Win32
+ {10FB199D-975A-4320-A09A-570C0E8A7890}.Release GLUIDLL.Build.0 = Release GLUIDLL|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Debug.ActiveCfg = Debug|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Debug.Build.0 = Debug|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Debug GLUIDLL.ActiveCfg = Debug GLUIDLL|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Debug GLUIDLL.Build.0 = Debug GLUIDLL|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Release.ActiveCfg = Release|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Release.Build.0 = Release|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Release GLUIDLL.ActiveCfg = Release GLUIDLL|Win32
+ {A0DFF582-F13B-4CFB-95CE-A026A503BDD8}.Release GLUIDLL.Build.0 = Release GLUIDLL|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Debug.ActiveCfg = Debug|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Debug.Build.0 = Debug|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Debug GLUIDLL.ActiveCfg = Debug GLUIDLL|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Debug GLUIDLL.Build.0 = Debug GLUIDLL|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Release.ActiveCfg = Release|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Release.Build.0 = Release|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Release GLUIDLL.ActiveCfg = Release GLUIDLL|Win32
+ {DE98CD9A-9830-46F8-835D-FB4D82182A7C}.Release GLUIDLL.Build.0 = Release GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.ActiveCfg = Debug|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.Build.0 = Debug|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug GLUIDLL.ActiveCfg = Debug GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug GLUIDLL.Build.0 = Debug GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.ActiveCfg = Release|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.Build.0 = Release|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release GLUIDLL.ActiveCfg = Release GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release GLUIDLL.Build.0 = Release GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.ActiveCfg = Debug|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug.Build.0 = Debug|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug GLUIDLL.ActiveCfg = Debug GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Debug GLUIDLL.Build.0 = Debug GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.ActiveCfg = Release|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release.Build.0 = Release|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release GLUIDLL.ActiveCfg = Release GLUIDLL|Win32
+ {7574E15F-58D0-41DD-8EC2-D8EED683230F}.Release GLUIDLL.Build.0 = Release GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Debug.ActiveCfg = Debug GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Debug.Build.0 = Debug GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Debug GLUIDLL.ActiveCfg = Debug GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Debug GLUIDLL.Build.0 = Debug GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Release.ActiveCfg = Release GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Release.Build.0 = Release GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Release GLUIDLL.ActiveCfg = Release GLUIDLL|Win32
+ {5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}.Release GLUIDLL.Build.0 = Release GLUIDLL|Win32
+ EndGlobalSection
+ GlobalSection(SolutionItems) = postSolution
+ README.txt = README.txt
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
diff --git a/thirdparty/glui/2.35/src/msvc/glui.vcproj b/thirdparty/glui/2.36/src/msvc/glui.vcproj
old mode 100755
new mode 100644
similarity index 92%
rename from thirdparty/glui/2.35/src/msvc/glui.vcproj
rename to thirdparty/glui/2.36/src/msvc/glui.vcproj
index 9e56f75ff4a02c4544502b5fac137c89089822ee..7b5e525ac4c142ce12594163eb899a0564f3b0eb
--- a/thirdparty/glui/2.35/src/msvc/glui.vcproj
+++ b/thirdparty/glui/2.36/src/msvc/glui.vcproj
@@ -1,503 +1,507 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="_glui library"
- ProjectGUID="{304505FF-4A2A-471E-B163-17446985C98E}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="../include"
- InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/glui.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="lib\glui32.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- RuntimeLibrary="3"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Debug/glui.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="1"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="lib\glui32.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\algebra3.cpp">
- </File>
- <File
- RelativePath="..\arcball.cpp">
- </File>
- <File
- RelativePath="..\glui.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui.h">
- </File>
- <File
- RelativePath="..\glui_add_controls.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_bitmap_img_data.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_bitmaps.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_button.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_checkbox.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_column.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_commandline.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_control.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_edittext.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_filebrowser.cpp">
- </File>
- <File
- RelativePath="..\glui_list.cpp">
- </File>
- <File
- RelativePath="..\glui_listbox.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_mouse_iaction.cpp">
- </File>
- <File
- RelativePath="..\glui_node.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_panel.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_radio.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_rollout.cpp">
- </File>
- <File
- RelativePath="..\glui_rotation.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_scrollbar.cpp">
- </File>
- <File
- RelativePath="..\glui_separator.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_spinner.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_statictext.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\glui_string.cpp">
- </File>
- <File
- RelativePath="..\glui_textbox.cpp">
- </File>
- <File
- RelativePath="..\glui_translation.cpp">
- </File>
- <File
- RelativePath="..\glui_tree.cpp">
- </File>
- <File
- RelativePath="..\glui_treepanel.cpp">
- </File>
- <File
- RelativePath="..\glui_window.cpp">
- </File>
- <File
- RelativePath="..\quaternion.cpp">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="_glui library"
+ ProjectGUID="{304505FF-4A2A-471E-B163-17446985C98E}"
+ RootNamespace="_glui library"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GLUI_BUILDING_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/glui.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="lib\glui32.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;GLUI_BUILDING_DLL"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Debug/glui.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="lib\glui32d.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\algebra3.cpp">
+ </File>
+ <File
+ RelativePath="..\arcball.cpp">
+ </File>
+ <File
+ RelativePath="..\glui.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\include\Gl\glui.h">
+ </File>
+ <File
+ RelativePath="..\glui_add_controls.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_bitmap_img_data.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_bitmaps.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_button.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_checkbox.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_column.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_commandline.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_control.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_edittext.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_filebrowser.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_internal.h">
+ </File>
+ <File
+ RelativePath="..\glui_list.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_listbox.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_mouse_iaction.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_node.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_panel.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_radio.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_rollout.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_rotation.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_scrollbar.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_separator.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_spinner.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_statictext.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\glui_string.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_textbox.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_translation.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_tree.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_treepanel.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_window.cpp">
+ </File>
+ <File
+ RelativePath="..\quaternion.cpp">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.36/src/msvc/gluidll.vcproj b/thirdparty/glui/2.36/src/msvc/gluidll.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..3bf22dad89e3e622724e2843c3d1a71ba77be896
--- /dev/null
+++ b/thirdparty/glui/2.36/src/msvc/gluidll.vcproj
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="_gluidll library"
+ ProjectGUID="{5803648B-B9F4-4BEB-A954-3C3EB5AE9FF6}"
+ RootNamespace="_gluidll library"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug GLUIDLL|Win32"
+ OutputDirectory="DebugDLL"
+ IntermediateDirectory="DebugDLL"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLUI_BUILDING_LIB;GLUIDLL"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin/glui32dlld.dll"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="2"
+ ImportLibrary="lib/glui32dlld.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release GLUIDLL|Win32"
+ OutputDirectory="ReleaseDLL"
+ IntermediateDirectory="ReleaseDLL"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLUI_BUILDING_LIB;GLUIDLL"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\$(TargetName)"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin/glui32dll.dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="lib/glui32dll.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\algebra3.cpp">
+ </File>
+ <File
+ RelativePath="..\algebra3.h">
+ </File>
+ <File
+ RelativePath="..\arcball.cpp">
+ </File>
+ <File
+ RelativePath="..\arcball.h">
+ </File>
+ <File
+ RelativePath="..\glui.cpp">
+ </File>
+ <File
+ RelativePath="..\include\Gl\glui.h">
+ </File>
+ <File
+ RelativePath="..\glui_add_controls.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_bitmap_img_data.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_bitmaps.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_button.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_checkbox.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_column.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_commandline.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_control.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_edittext.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_filebrowser.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_internal.h">
+ </File>
+ <File
+ RelativePath="..\glui_internal_control.h">
+ </File>
+ <File
+ RelativePath="..\glui_list.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_listbox.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_mouse_iaction.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_node.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_panel.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_radio.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_rollout.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_rotation.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_scrollbar.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_separator.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_spinner.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_statictext.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_string.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_textbox.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_translation.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_tree.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_treepanel.cpp">
+ </File>
+ <File
+ RelativePath="..\glui_window.cpp">
+ </File>
+ <File
+ RelativePath="..\quaternion.cpp">
+ </File>
+ <File
+ RelativePath="..\quaternion.h">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/thirdparty/glui/2.35/src/msvc/ppm2array.dsp b/thirdparty/glui/2.36/src/msvc/ppm2array.dsp
old mode 100755
new mode 100644
similarity index 97%
rename from thirdparty/glui/2.35/src/msvc/ppm2array.dsp
rename to thirdparty/glui/2.36/src/msvc/ppm2array.dsp
index 35e8a95c15b6655af9e99278fbc475fa64e71a98..c14a3c623f7f630ab0731105d31e1a987da651bb
--- a/thirdparty/glui/2.35/src/msvc/ppm2array.dsp
+++ b/thirdparty/glui/2.36/src/msvc/ppm2array.dsp
@@ -1,98 +1,98 @@
-# Microsoft Developer Studio Project File - Name="ppm2array" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ppm2array - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ppm2array.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ppm2array.mak" CFG="ppm2array - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ppm2array - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ppm2array - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ppm2array - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/ppm2array.exe"
-
-!ELSEIF "$(CFG)" == "ppm2array - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ppm2array"
-# PROP BASE Intermediate_Dir "ppm2array"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ppm2array"
-# PROP Intermediate_Dir "ppm2array"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/ppm2arrayd.exe" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "ppm2array - Win32 Release"
-# Name "ppm2array - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\tools\ppm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\tools\ppm.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\tools\ppm2array.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="ppm2array" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=ppm2array - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "ppm2array.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "ppm2array.mak" CFG="ppm2array - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "ppm2array - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ppm2array - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "ppm2array - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/ppm2array.exe"
+
+!ELSEIF "$(CFG)" == "ppm2array - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ppm2array"
+# PROP BASE Intermediate_Dir "ppm2array"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ppm2array"
+# PROP Intermediate_Dir "ppm2array"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glut32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/ppm2arrayd.exe" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "ppm2array - Win32 Release"
+# Name "ppm2array - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\tools\ppm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\tools\ppm.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\tools\ppm2array.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/thirdparty/glui/2.35/src/quaternion.cpp b/thirdparty/glui/2.36/src/quaternion.cpp
similarity index 85%
rename from thirdparty/glui/2.35/src/quaternion.cpp
rename to thirdparty/glui/2.36/src/quaternion.cpp
index 048890111d9f63b842c796838a4896f992cd761e..993adc1d8ec06bcd88f7ce60adbe529d608cfbbc 100644
--- a/thirdparty/glui/2.35/src/quaternion.cpp
+++ b/thirdparty/glui/2.36/src/quaternion.cpp
@@ -4,25 +4,27 @@
-------------------------------------------------------------------
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
Copyright (c) 1998 Paul Rademacher
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
************************************************************************
diff --git a/thirdparty/glui/2.35/src/quaternion.h b/thirdparty/glui/2.36/src/quaternion.h
similarity index 82%
rename from thirdparty/glui/2.35/src/quaternion.h
rename to thirdparty/glui/2.36/src/quaternion.h
index f58a7445e5273c34a5f4934fd50a56f0e7f5b3e1..6d03984fd10e9a587c6de84e951d2d6b1ab6ee73 100644
--- a/thirdparty/glui/2.35/src/quaternion.h
+++ b/thirdparty/glui/2.36/src/quaternion.h
@@ -2,7 +2,7 @@
quaternion.h - A quaternion class
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
Copyright (c) 1998 Paul Rademacher
---------------------------------------------------------------------
@@ -10,19 +10,21 @@
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*****************************************************************************/
diff --git a/thirdparty/glui/2.35/src/readme.txt b/thirdparty/glui/2.36/src/readme.txt
old mode 100755
new mode 100644
similarity index 79%
rename from thirdparty/glui/2.35/src/readme.txt
rename to thirdparty/glui/2.36/src/readme.txt
index 81faa4a39486e7690a3ae00cf273ca4a103d513b..c2ec379400238139232f1ebb1560b84b38f8f628
--- a/thirdparty/glui/2.35/src/readme.txt
+++ b/thirdparty/glui/2.36/src/readme.txt
@@ -1,228 +1,268 @@
-Welcome to the GLUI User Interface Library, v2.3!
-March 22, 2005
--------------------------------------------------
-
-This distribution contains the latest community-maintained fork of the
-GLUI Library. It is based on the GLUI v2.1 beta version from Paul
-Rademacher (http://www.cs.unc.edu/~rademach/glui/) plus the
-compatibility changes made by Nigel Stewart in his "GLUI v2.2"
-(http://www.nigels.com/glt/glui) In accordance with the LGPL under
-which the library is released (according to Paul's web page at least),
-these changes are available to everyone in the community.
-
-WARNING: This version (2.3) introduces some incompatible changes with
-previous versions!!
-
-CHANGES:
-
-----------------------------------
-- GLUI_String is now a std::string
- This is the main source of most incopatibilities, but I felt it was
- a necessary change, because the previous usage of a fixed-sized
- buffer was just too unsafe. I myself was bitten a few times passing
- a char* buffer of insufficient size into GLUI as a live variable.
- It is still possible to use a char buffer, but it is not recommended.
-
- If you used GLUI_String before as a live var type, the easiest way
- to get your code compiling again is to change those to "char
- buf[300]". The better way, though, is to update your code to treat
- it as a std::string.
-
- For instance, if you used to pass mystr to functions that take
- 'const char*', now use mystr.c_str() method, instead.
- If you used strcpy(mystr, b) to set the value, now just do mystr=b.
- If you used sprintf(mystr,...) to set the value, now do
- glui_format_string(mystr,...).
- If you used to clear the string with mystr[0]='\0', now just clear
- it with mystr="".
-
-----------------------------------
-- Enhanced GLUI_EditText
- Control keys can be used for navigation and control. The bindings
- are bash-like: Ctrl-B for previous char, Ctrl-F for forward char, etc.
- bindings. Also control keys that aren't bound to commands are
- simply ignored, whereas before they would be inserted as invisible
- characters.
-
-----------------------------------
-- Added GLUI_CommandLine class
- This is a GLUI_EditText with a history mechanism.
-
-----------------------------------
-- New, more object oriented construction API.
- Now instead of calling
-
- glui->add_button_to_panel( panel, "my button", myid, mycallback );
-
- you should just call the button constructor:
-
- new GLUI_Button( panel, "my button", myid, mycallback );
-
- And similarly to add it to a GLUI instead of a panel, rather than:
-
- glui->add_button( glui, "my button", myid, mycallback );
-
- just call the constructor with the GLUI as the first argument:
-
- new GLUI_Button( glui, "my button", myid, mycallback );
-
- The old scheme is now deprecated, but still works. The benefit of
- this new scheme is that now the GLUI class doesn't have to know
- about all the different types of GLUI_Controls that exist.
- Previously GLUI had to both know about all the controls, and know
- how to initialize them. Now the responsibility for initialization
- belongs to the GLUI_Control subclasses themselves, where it
- belongs. Additionally it means that you can create your own
- GLUI_Control subclasses which will be on equal footing with the
- built-in controls, whereas before any user-created controls would
- always be "second-class citizens" since they would have to be
- constructed differently from the built-ins.
-
-
-----------------------------------
-- Removed need for type-declaring arguments when argment type suffices.
- This effects GLUI_Spinner and GLUI_EditText (and GLUI_CommandLine?).
-
- For example, instead of calling
-
- new GLUI_Spinner( glui, "myspin", GLUI_SPINNER_INT, &live_int_var );
-
- you can just omit the GLUI_SPINNER_INT part, because the type of the
- live_int_var tells the compiler which type you want.
-
- new GLUI_Spinner( glui, "myspin", &live_int_var );
-
- If you're not using a live, var, you can still use the
- GLUI_SPINNER_INT type argument. See glui.h for all the new
- constructor signatures. Note this only works with the new
- construction API, not with the old "add_blah_to_panel" style of
- API.
-
-----------------------------------
-- GLUI_Rotation uses your matrix live-variable now.
- GLUI used to ignore the matrix in your live variable. This version
- doesn't ignore it, so you'll need to set it to the identity matrix
- yourself if that's what you want it to start as. There could
- probably be some improvements to this API, though.
-
-----------------------------------
-- Improvements to 'const' usage.
- Most char*'s in GLUI functions used to be non-const even when the
- functions did not modify the string. I changed everywhere
- appropriate to use const char* instead.
-
-----------------------------------
-- Updated license info in the headers
- Paul's web page says that GLUI is LGPL, but that wasn't declared in
- the code itself. I've modified all the headers with the standard
- LGPL notice.
-
-----------------------------------
-- Updated examples for the API changes
-
-----------------------------------
-- Created project files for Visual Studio .NET (MSVC7.1)
-
-
-That's about it. Enjoy!
-
-
-If you find yourself with too much time on your hands, the things I
-think would be most useful for future improvements to GLUI would be:
-
-1. The GLUI_TextBox and GLUI_Tree definitely need some work, still.
-2. Clipboard integration under Windows/X-Win. I have some code that
- works on Win32 that I once integrated with GLUI, but I lost that
- version somewhere. I still have the Win32 clipboard code, though
- if anyone wants to work on integrating it. I have some X-Win
- clipboard code, too, but I never got it working quite right.
-3. Remove the dependency on GLUT, making the connection with window
- system APIs into a more plug-in/adapter modular design.
- So e.g. if you want to use GLUT, you'd link with the GLUI lib and a
- GLUI_GLUT lib, and call one extra GLUI_glut_init() function or
- something.
-
-
-Definitly consider submitting a patch if you've made some nice improvements
-to GLUI. Hopefully being an LGPL sourceforge project will attract some new
-interest to the GLUI project.
-
-Bill Baxter
-baxter
-at
-cs unc edu
-
-=================================================
-JOHN KEW'S ADDITIONS (March 2005)
-=================================================
-
-Thanks to John Kew of Natural Solutions Inc.,
-there are some new widgets. These are demonstrated in example6.cpp.
-
-The new widgets are:
-
-* GLUI_Scrollbar - A scrollbar slider widget
-* GLUI_TextBox - A multi-line text widget
-* GLUI_List - A static choice list
-* GLUI_FileBrowser - A simple filebrowser based on GLUI_List
-* GLUI_Tree - Hierarchical tree widget
-* GLUI_TreePanel - Manager for the tree widget
-
-And one other change:
-
-* GLUI_Rollout has optional embossed border
-
-=================================================
-PAUL'S ORIGINAL GLUI 2.0/2.1 README
-=================================================
-
-Welcome to the GLUI User Interface Library, v2.0 beta!
--------------------------------------------------
-
-This distribution contains the full GLUI sources, as well as 5 example
-programs. You'll find the full manual under "glui_manual.pdf". The
-GLUI web page is at
-
- http://www.cs.unc.edu/~rademach/glui
-
-
- ---------- Windows ----------
-
-The directory 'msvc' contains a Visual C++ workspace entitled
-'glui.dsw'. To recompile the library and examples, open this
-workspace and run the menu command "Build:Batch Build:Build". The 3
-executables will be in the 'bin' directory, and the library in the
-'lib' directory.
-
-To create a new Windows executable using GLUI, create a "Win32 Console
-Application" in VC++, add the GLUI library (in 'msvc/lib/glui32.lib'),
-and add the OpenGL libs:
-
- glui32.lib glut32.lib glu32.lib opengl32.lib (Microsoft OpenGL)
-
-Include the file "glui.h" in any file that uses the GLUI library.
-
-
- ---------- Unix ----------
-
-An SGI/HP makefile is found in the file 'makefile' (certain lines may need
-to be commented/uncommented).
-
-To include GLUI in your own apps, add the glui library to your
-makefile (before the glut library 'libglut.a'), and include "glui.h"
-in your sources.
-
-
-
-----------------------------------------------------------------------
-
-Please let me know what you think, what you'd like to change or add,
-and especially what bugs you encounter. Also, please send me your
-e-mail so I can add you to a mailing list for updates.
-
-Good luck, and thanks for trying this out!
-
-Paul Rademacher
-rademach
-at
+Welcome to the GLUI User Interface Library
+-------------------------------------------------
+
+This distribution contains the latest community-maintained fork of the
+GLUI Library, now under the ZLIB license. It is based on the GLUI
+v2.1 beta version from Paul Rademacher
+(http://www.cs.unc.edu/~rademach/glui/) plus the compatibility changes
+made by Nigel Stewart in his "GLUI v2.2"
+(http://www.nigels.com/glt/glui).
+
+
+WARNING: This version (2.3) introduces some incompatible changes with
+previous versions!!
+
+----------------------------------
+CHANGES:
+Version 2.36, November 4, 2007
+
+- License changed to the more permissive ZLIB license
+ with the blessing of Paul Rademacher, Nigel Stewart, Bill Baxter,
+ John Kew, Orion Sky Lawlor and all other developers.
+
+----------------------------------
+CHANGES:
+Version 2.35, July 7, 2006
+
+- Applied patch [950354] "Good Idle For Spinners" written by Alain
+ Durat. This makes it so GLUI doesn't suck up 100% of your CPU time
+ when nothing is happening.
+
+Many changes submitted by Orion Sky Lawlor.
+- Comments: I've added doxygen comments to all of glui.h. Use "make
+ docs" to generate Doxygen in doc/html/index.html.
+- Bug fix: rollout actually resizes properly when opened (bin/example5
+ demonstrated this bug).
+- Bug fix: scroll bars have a (saner) time-based speed limit. This is
+ visible in scrolling around in bin/example6.
+- Appearance: double-buffering can be turned on globally, eliminating
+ flicker when, e.g., resizing bin/example5 window. This is on by
+ default; turn double-buffering off in GLUI::init or set
+ glui->buffer_mode to GLUI::buffer_front.
+- Appearance: the texture used in the GLUI_Rotation
+ control sphere is now mipmapped, which is much smoother than
+ nearest-neighbor. It's also a stored (glGenTextures) texture, which
+ is much much faster.
+- Optimization: I moved GLUI_Node::add_child_to_control to a more
+ linker-friendly location. Now non-deprecated executables are up to
+ 100KB smaller on disk.
+- Optimization: glui_img's are now 1 byte per pixel instead of 3 ints
+ per pixel. This saves 50KB+ space on disk in the library and each
+ executable.
+
+
+
+----------------------------------
+CHANGES:
+Version 2.3, March 22, 2005
+
+- GLUI_String is now a std::string
+ This is the main source of most incompatibilities, but I felt it was
+ a necessary change, because the previous usage of a fixed-sized
+ buffer was just too unsafe. I myself was bitten a few times passing
+ a char* buffer of insufficient size into GLUI as a live variable.
+ It is still possible to use a char buffer, but it is not recommended.
+
+ If you used GLUI_String before as a live var type, the easiest way
+ to get your code compiling again is to change those to "char
+ buf[300]". The better way, though, is to update your code to treat
+ it as a std::string.
+
+ For instance, if you used to pass mystr to functions that take
+ 'const char*', now use mystr.c_str() method, instead.
+ If you used strcpy(mystr, b) to set the value, now just do mystr=b.
+ If you used sprintf(mystr,...) to set the value, now do
+ glui_format_string(mystr,...).
+ If you used to clear the string with mystr[0]='\0', now just clear
+ it with mystr="".
+
+----------------------------------
+- Enhanced GLUI_EditText
+ Control keys can be used for navigation and control. The bindings
+ are bash-like: Ctrl-B for previous char, Ctrl-F for forward char, etc.
+ bindings. Also control keys that aren't bound to commands are
+ simply ignored, whereas before they would be inserted as invisible
+ characters.
+
+----------------------------------
+- Added GLUI_CommandLine class
+ This is a GLUI_EditText with a history mechanism.
+
+----------------------------------
+- New, more object oriented construction API.
+ Now instead of calling
+
+ glui->add_button_to_panel( panel, "my button", myid, mycallback );
+
+ you should just call the button constructor:
+
+ new GLUI_Button( panel, "my button", myid, mycallback );
+
+ And similarly to add it to a GLUI instead of a panel, rather than:
+
+ glui->add_button( glui, "my button", myid, mycallback );
+
+ just call the constructor with the GLUI as the first argument:
+
+ new GLUI_Button( glui, "my button", myid, mycallback );
+
+ The old scheme is now deprecated, but still works. The benefit of
+ this new scheme is that now the GLUI class doesn't have to know
+ about all the different types of GLUI_Controls that exist.
+ Previously GLUI had to both know about all the controls, and know
+ how to initialize them. Now the responsibility for initialization
+ belongs to the GLUI_Control subclasses themselves, where it
+ belongs. Additionally it means that you can create your own
+ GLUI_Control subclasses which will be on equal footing with the
+ built-in controls, whereas before any user-created controls would
+ always be "second-class citizens" since they would have to be
+ constructed differently from the built-ins.
+
+
+----------------------------------
+- Removed need for type-declaring arguments when argment type suffices.
+ This effects GLUI_Spinner and GLUI_EditText (and GLUI_CommandLine?).
+
+ For example, instead of calling
+
+ new GLUI_Spinner( glui, "myspin", GLUI_SPINNER_INT, &live_int_var );
+
+ you can just omit the GLUI_SPINNER_INT part, because the type of the
+ live_int_var tells the compiler which type you want.
+
+ new GLUI_Spinner( glui, "myspin", &live_int_var );
+
+ If you're not using a live, var, you can still use the
+ GLUI_SPINNER_INT type argument. See glui.h for all the new
+ constructor signatures. Note this only works with the new
+ construction API, not with the old "add_blah_to_panel" style of
+ API.
+
+----------------------------------
+- GLUI_Rotation uses your matrix live-variable now.
+ GLUI used to ignore the matrix in your live variable. This version
+ doesn't ignore it, so you'll need to set it to the identity matrix
+ yourself if that's what you want it to start as. There could
+ probably be some improvements to this API, though.
+
+----------------------------------
+- Improvements to 'const' usage.
+ Most char*'s in GLUI functions used to be non-const even when the
+ functions did not modify the string. I changed everywhere
+ appropriate to use const char* instead.
+
+----------------------------------
+- Updated license info in the headers
+ Paul's web page says that GLUI is LGPL, but that wasn't declared in
+ the code itself. I've modified all the headers with the standard
+ LGPL notice.
+
+----------------------------------
+- Updated examples for the API changes
+
+----------------------------------
+- Created project files for Visual Studio .NET (MSVC7.1)
+
+
+That's about it. Enjoy!
+
+
+If you find yourself with too much time on your hands, the things I
+think would be most useful for future improvements to GLUI would be:
+
+1. The GLUI_TextBox and GLUI_Tree definitely need some work, still.
+2. Clipboard integration under Windows/X-Win. I have some code that
+ works on Win32 that I once integrated with GLUI, but I lost that
+ version somewhere. I still have the Win32 clipboard code, though
+ if anyone wants to work on integrating it. I have some X-Win
+ clipboard code, too, but I never got it working quite right.
+3. Remove the dependency on GLUT, making the connection with window
+ system APIs into a more plug-in/adapter modular design.
+ So e.g. if you want to use GLUT, you'd link with the GLUI lib and a
+ GLUI_GLUT lib, and call one extra GLUI_glut_init() function or
+ something.
+
+
+Definitly consider submitting a patch if you've made some nice improvements
+to GLUI. Hopefully being an LGPL sourceforge project will attract some new
+interest to the GLUI project.
+
+Bill Baxter
+baxter
+at
+cs unc edu
+
+=================================================
+JOHN KEW'S ADDITIONS (March 2005)
+=================================================
+
+Thanks to John Kew of Natural Solutions Inc.,
+there are some new widgets. These are demonstrated in example6.cpp.
+
+The new widgets are:
+
+* GLUI_Scrollbar - A scrollbar slider widget
+* GLUI_TextBox - A multi-line text widget
+* GLUI_List - A static choice list
+* GLUI_FileBrowser - A simple filebrowser based on GLUI_List
+* GLUI_Tree - Hierarchical tree widget
+* GLUI_TreePanel - Manager for the tree widget
+
+And one other change:
+
+* GLUI_Rollout has optional embossed border
+
+=================================================
+PAUL'S ORIGINAL GLUI 2.0/2.1 README
+=================================================
+
+Welcome to the GLUI User Interface Library, v2.0 beta!
+-------------------------------------------------
+
+This distribution contains the full GLUI sources, as well as 5 example
+programs. You'll find the full manual under "glui_manual.pdf". The
+GLUI web page is at
+
+ http://www.cs.unc.edu/~rademach/glui
+
+
+ ---------- Windows ----------
+
+The directory 'msvc' contains a Visual C++ workspace entitled
+'glui.dsw'. To recompile the library and examples, open this
+workspace and run the menu command "Build:Batch Build:Build". The 3
+executables will be in the 'bin' directory, and the library in the
+'lib' directory.
+
+To create a new Windows executable using GLUI, create a "Win32 Console
+Application" in VC++, add the GLUI library (in 'msvc/lib/glui32.lib'),
+and add the OpenGL libs:
+
+ glui32.lib glut32.lib glu32.lib opengl32.lib (Microsoft OpenGL)
+
+Include the file "glui.h" in any file that uses the GLUI library.
+
+
+ ---------- Unix ----------
+
+An SGI/HP makefile is found in the file 'makefile' (certain lines may need
+to be commented/uncommented).
+
+To include GLUI in your own apps, add the glui library to your
+makefile (before the glut library 'libglut.a'), and include "glui.h"
+in your sources.
+
+
+
+----------------------------------------------------------------------
+
+Please let me know what you think, what you'd like to change or add,
+and especially what bugs you encounter. Also, please send me your
+e-mail so I can add you to a mailing list for updates.
+
+Good luck, and thanks for trying this out!
+
+Paul Rademacher
+rademach
+at
cs unc edu
diff --git a/thirdparty/glui/2.35/src/tools/ppm.cpp b/thirdparty/glui/2.36/src/tools/ppm.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/tools/ppm.cpp
rename to thirdparty/glui/2.36/src/tools/ppm.cpp
diff --git a/thirdparty/glui/2.35/src/tools/ppm.h b/thirdparty/glui/2.36/src/tools/ppm.h
similarity index 100%
rename from thirdparty/glui/2.35/src/tools/ppm.h
rename to thirdparty/glui/2.36/src/tools/ppm.h
diff --git a/thirdparty/glui/2.35/src/tools/ppm2array.cpp b/thirdparty/glui/2.36/src/tools/ppm2array.cpp
similarity index 100%
rename from thirdparty/glui/2.35/src/tools/ppm2array.cpp
rename to thirdparty/glui/2.36/src/tools/ppm2array.cpp
diff --git a/thirdparty/glui/2.35/src/viewmodel.cpp b/thirdparty/glui/2.36/src/viewmodel.cpp
similarity index 87%
rename from thirdparty/glui/2.35/src/viewmodel.cpp
rename to thirdparty/glui/2.36/src/viewmodel.cpp
index f51be27ded2c19614367dda1dc9b991c6b492b2c..602a540642a6efb0a8b00b0a5c1ff656a4ed1fb8 100644
--- a/thirdparty/glui/2.35/src/viewmodel.cpp
+++ b/thirdparty/glui/2.36/src/viewmodel.cpp
@@ -2,25 +2,27 @@
viewmodel.cpp
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
Copyright (c) 1998 Paul Rademacher
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*/
diff --git a/thirdparty/glui/2.35/src/viewmodel.h b/thirdparty/glui/2.36/src/viewmodel.h
similarity index 91%
rename from thirdparty/glui/2.35/src/viewmodel.h
rename to thirdparty/glui/2.36/src/viewmodel.h
index c62932cfe8d466f47dd22a2dae5b8a7def0c7338..4a3d5a2b01c5eef460d24af7b7e47a8b6a7693c4 100644
--- a/thirdparty/glui/2.35/src/viewmodel.h
+++ b/thirdparty/glui/2.36/src/viewmodel.h
@@ -2,25 +2,27 @@
ViewModel.h
- GLUI User Interface Toolkit (LGPL)
+ GLUI User Interface Toolkit
Copyright (c) 1998 Paul Rademacher
WWW: http://sourceforge.net/projects/glui/
Forums: http://sourceforge.net/forum/?group_id=92496
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*/
diff --git a/thirdparty/glui/2.35/www/image1.png b/thirdparty/glui/2.36/www/image1.png
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/www/image1.png
rename to thirdparty/glui/2.36/www/image1.png
diff --git a/thirdparty/glui/2.35/www/index.html b/thirdparty/glui/2.36/www/index.html
old mode 100755
new mode 100644
similarity index 82%
rename from thirdparty/glui/2.35/www/index.html
rename to thirdparty/glui/2.36/www/index.html
index 4cc968076993be296ecaa799d70af3503432cfe0..4ade537fdf1fff366c8f6e0b90d9001e6dee0363
--- a/thirdparty/glui/2.35/www/index.html
+++ b/thirdparty/glui/2.36/www/index.html
@@ -1,209 +1,210 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="Content-Style-Type" content="text/css">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Author" content="Nigel Stewart, Paul Rademacher">
- <meta name="KeyWords" content="GLUI, OpenGL, GLUT, C++, User Interface">
- <title>GLUI User Interface Library</title>
-</head>
-<body text="#000000" bgcolor="#FFFFFF" style="font-family: Arial,Helvetica; margin: 1em">
-
-<table>
-<tr>
-
-<td width="100%">
-<p align="center">
-<a href="http://glui.sourceforge.net"><img src="title.jpg" alt="GLUI User Interface Library" width="391" height="40" border="0"></a><br><br>
-<b>Version 2.2</b><br><br>
-Written by <a HREF="http://www.cs.unc.edu/~rademach">Paul Rademacher</a><br>
-Maintained by <a href="http://www.nigels.com/">Nigel Stewart</a>
-</p>
-</td>
-
-<td width="10"/>
-
-<td align="center">
-<font size=-1>GLUI<br/><a href="http://glui.sourceforge.net">Homepage</a></font><br/>
-<br/>
-
-<font size=-3>Sourceforge:</font><br/>
-<font size=-2>
-<a href="http://sourceforge.net/projects/glui">Summary</a><br/>
-<a href="http://sourceforge.net/news/?group_id=92496">News</a><br/>
-<a href="http://sourceforge.net/forum/?group_id=92496">Forums</a><br/>
-<a href="http://sourceforge.net/tracker/?group_id=92496&atid=600952">Bugs</a><br/>
-<a href="http://cvs.sourceforge.net/viewcvs.py/glui/glui/src/">CVS</a><br/>
-<a href="http://sourceforge.net/project/showfiles.php?group_id=92496">Files</a><br/>
-<br/>
-Mirrors<br/><a href="http://sf.gds.tuwien.ac.at/g/gl/glui/">[at]</a><br/>
-
-</font>
-<br/>
-
-<a href="http://sourceforge.net">
-<img src="http://sourceforge.net/sflogo.php?group_id=92496" width="88" height="31" border="0" alt="SourceForge Logo"></a>
-<br/><br/>
-<a href="http://validator.w3.org/check?uri=referer">
-<img border="0" src="valid-html401.png" alt="Valid HTML 4.01!" height="31" width="88"></a>
-
-</td>
-</tr></table>
-
-<h3>Status</h3>
-
-<p>
-<b>March 2005</b><br>
-GLUI website migration to SourceForge.<br>
-Some new features are being merged into CVS.<br>
-</p>
-
-<p>
-<b>October 2003</b><br>
-GLUI is being migrated to SourceForge.<br>
-Source code is now available via <a href="https://sourceforge.net/cvs/?group_id=92496">CVS</a>.<br>
-<a href="https://sourceforge.net/forum/forum.php?forum_id=319502">Help</a>,
-<a href="https://sourceforge.net/forum/forum.php?forum_id=319503">developer</a>,
-and
-<a href="https://sourceforge.net/forum/forum.php?forum_id=319501">open</a>
-discussion forums have been established.<br>
-<a href="https://sourceforge.net/tracker/?group_id=92496&atid=600952">Bug Tracking</a>
-is also available.
-</p>
-
-<p>
-<b>25th November 2002</b><br>
-Version 2.2 is available.<br>
-This is an update for gcc 3.2.<br>
-There are no feature enhancements or incompatibilities with 2.1.<br>
-<a href="#download">Download</a> GLUI 2.2
-</p>
-
-<hr>
-
-<h3>What is GLUI?</h3>
-
-<p align="justify">
-GLUI is a GLUT-based C++ user interface library which provides
-controls such as buttons, checkboxes, radio buttons, and spinners
-to OpenGL applications. It is window-system independent, relying
-on GLUT to handle all system-dependent issues, such as window
-and mouse management.
-</p>
-
-<p>Features of the GLUI User Interface Library include:</p>
-
-<ul>
-<li>Complete integration with GLUT toolkit</li>
-<li>Simple creation of a new user interface window with a single line of code</li>
-<li>Support for multiple user interface windows</li>
-<li>Standard user interface controls such as:
- <ul>
- <li>Buttons</li>
- <li>Checkboxes for boolean variables</li>
- <li>Radio Buttons for mutually-exclusive options</li>
- <li>Editable text boxes for inputting text, integers, and floating-point values</li>
- <li>Spinners for interactively manipulating integer and floating-point values</li>
- <li>Static text fields</li>
- <li>Panels for grouping sets of controls</li>
- <li>Separator lines to help visually organize groups of controls</li>
- </ul>
-<li>Controls can generate callbacks when their values change</li>
-<li>Variables can be linked to controls and automatically updated when the value of the control changes (<I>"live variables"</I>)</li>
-<li>Controls can be automatically synchronized to reflect changes in live variables</li>
-<li>Controls can trigger GLUT redisplay events when their values change</li>
-<li>Layout and sizing of controls is automatic</li>
-<li>Controls can be grouped into columns</li>
-<li>User can cycle through controls using Tab key</li>
-</ul>
-
-<h3>What does GLUI look like?</h3>
-
-<p>
-Here's an example GLUI window, showing the different controls. This
-window is rendered entirely in OpenGL. It therefore looks the same on
-PCs, Macs, SGIs, and other Unixes, using either SGI's implementation
-of OpenGL, Microsoft's, or Mesa's.
-</p>
-
-<p align="center"><img src="image1.png" alt="GLUI OpenGL Interface" width="401" height="252" border="0"></p>
-
-<hr>
-
-<h3>New in Version 2</h3>
-
-<p>GLUI version 2 includes the following new features and controls:</p>
-
-<ul>
-<li>GLUI controls within the main graphics window.</li>
-<li>Functions for cleanly destroying GLUI windows and subwindows.</li>
-<li>Functions for hiding and showing GLUI windows and subwindows.</li>
-<li>A sync_live_all() for automatically synchronizing all live variables in all GLUI windows simultaneously.</li>
-<li>Rollouts - collapsible panels for reducing screen clutter.</li>
-<li>Listboxes - allows the user to choose an item from a list of strings.</li>
-<li>Rotation and translation controllers - for easily receiving 3D interaction input from the user.</li>
-</ul>
-
-<p>Here is a screenshot (from Windows) showing all the GLUI version 2.0 controls:</p>
-<p align="center"><img src="screen2.png" alt="Windows GLUI" width="548" height="315" border="0"></p>
-
-<p>And another screenshot (from X-Windows/Mwm), showing the new features, including
-GLUI subwindows docked inside the main graphics window.</p>
-<p align="center"><img src="screen3.png" alt="X-Windows GLUI" width="585" height="312" border="0"></p>
-
-<hr>
-
-<h3><A NAME="download">Download GLUI</a></h3>
-
-<p>Version 2.2</p>
-
- <ul>
- <li>Source: <a href="http://prdownloads.sourceforge.net/glui/glui_v2_2.tgz?download">glui_v2_2.tgz</a></li>
- <li>Source: <a href="http://prdownloads.sourceforge.net/glui/glui_v2_2.zip?download">glui_v2_2.zip</a></li>
- <li>DevPak: <a href="http://prdownloads.sourceforge.net/glui/glui.2.2-1.DevPak?download">glui.2.2-1.DevPak</a></li>
- <li>Manual: <a href="http://prdownloads.sourceforge.net/glui/glui_manual_v2_beta.pdf?download">glui_manual_v2_beta.pdf</a></li>
- </ul>
-
-<p>Files <a href="http://sourceforge.net/project/showfiles.php?group_id=92496"> hosted by SourceForge</a></p>
-
-<p> Versions previous to GLUI 2.2 <a href="http://www.cs.unc.edu/~rademach/glui/">are available</a>.</p>
-
-<hr>
-
-<h3>License Information</h3>
-
-<p>
-GLUI is licensed under <a HREF="http://www.gnu.org/copyleft/lesser.html">LGPL</a>.
-</p>
-
-<hr>
-
-<h3>Projects Using GLUI</h3>
-
-<ul>
- <li><a href="http://doris.sourceforge.net/">Doris</a> - a script driven OpenGL viewer using Lua.</li>
-</ul>
-
-<hr>
-
-<h3>Wish List</h3>
-
-<ul>
- <li>Convert documentation to LaTeX</li>
- <li>Doxygen documentation</li>
- <li>Feature request: Floating controls over a 3D canvas</li>
-</ul>
-
-<hr>
-
-<h3>Links</h3>
-
-<ul>
-<li>Paul Rademacher's <a href="http://www.cs.unc.edu/~rademach/glui/">original GLUI page</a>.</li>
-<li>European <a href="http://gd.tuwien.ac.at/hci/glui/">GLUI mirror</a> page.</li>
-<li>GLUI <a href="http://freshmeat.net/projects/glui/">freshmeat</a> page.</li>
-<li><a href="http://www.opengl.org">OpenGL.org</a></li>
-</ul>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Style-Type" content="text/css">
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="Author" content="Nigel Stewart, Paul Rademacher, Bill Baxter">
+ <meta name="KeyWords" content="GLUI, OpenGL, GLUT, C++, User Interface">
+ <title>GLUI User Interface Library</title>
+</head>
+<body text="#000000" bgcolor="#FFFFFF" style="font-family: Arial,Helvetica; margin: 1em">
+
+<table>
+<tr>
+
+<td width="100%">
+<p align="center">
+<a href="http://glui.sourceforge.net"><img src="title.jpg" alt="GLUI User Interface Library" width="391" height="40" border="0"></a><br><br>
+<b>Version 2.35</b><br><br>
+Written by <a HREF="http://www.cs.unc.edu/~rademach">Paul Rademacher</a><br>
+Maintained by <a href="http://www.nigels.com/">Nigel Stewart</a>
+and <a href="http://www.billbaxter.com/">Bill Baxter</a>
+</p>
+</td>
+
+<td width="10"/>
+
+<td align="center">
+<font size=-1>GLUI<br/><a href="http://glui.sourceforge.net">Homepage</a></font><br/>
+<br/>
+
+<font size=-3>Sourceforge:</font><br/>
+<font size=-2>
+<a href="http://sourceforge.net/projects/glui">Summary</a><br/>
+<a href="http://sourceforge.net/news/?group_id=92496">News</a><br/>
+<a href="http://sourceforge.net/forum/?group_id=92496">Forums</a><br/>
+<a href="http://sourceforge.net/tracker/?group_id=92496&atid=600952">Bugs</a><br/>
+<a href="http://cvs.sourceforge.net/viewcvs.py/glui/glui/src/">CVS</a><br/>
+<a href="http://sourceforge.net/project/showfiles.php?group_id=92496">Files</a><br/>
+<br/>
+
+</font>
+<br/>
+
+<a href="http://sourceforge.net">
+<img src="http://sourceforge.net/sflogo.php?group_id=92496" width="88" height="31" border="0" alt="SourceForge Logo"></a>
+<br/><br/>
+<a href="http://validator.w3.org/check?uri=referer">
+<img border="0" src="valid-html401.png" alt="Valid HTML 4.01!" height="31" width="88"></a>
+
+</td>
+</tr></table>
+
+<h3>Status</h3>
+
+<p>
+<b>July 2006</b><br>
+After about a year of GLUI 2.3 sitting around in CVS, finally a new
+official release! We've skipped right past 2.3 and gone straight to
+GLUI 2.35 (<a HREF="http://sourceforge.net/project/shownotes.php?release_id=430115&group_id=92496">release notes</a>).<br>
+GLUI 2.35 includes not only the never-released changes
+made for 2.3, but also several tasty new improvements submitted by
+Alain Daurat and Orion Sky Lawlor.
+</p>
+
+<p>
+<b>March 2005</b><br>
+GLUI website migration to SourceForge.<br>
+Some new features are being merged into CVS.<br>
+</p>
+
+<hr>
+
+<h3>What is GLUI?</h3>
+
+<p align="justify">
+GLUI is a GLUT-based C++ user interface library which provides
+controls such as buttons, checkboxes, radio buttons, and spinners
+to OpenGL applications. It is window-system independent, relying
+on GLUT to handle all system-dependent issues, such as window
+and mouse management.
+</p>
+
+<p>Features of the GLUI User Interface Library include:</p>
+
+<ul>
+<li>Complete integration with GLUT toolkit</li>
+<li>Simple creation of a new user interface window with a single line of code</li>
+<li>Support for multiple user interface windows</li>
+<li>Standard user interface controls such as:
+ <ul>
+ <li>Buttons</li>
+ <li>Checkboxes for boolean variables</li>
+ <li>Radio Buttons for mutually-exclusive options</li>
+ <li>Editable text boxes for inputting text, integers, and floating-point values</li>
+ <li>Spinners for interactively manipulating integer and floating-point values</li>
+ <li>Static text fields</li>
+ <li>Panels for grouping sets of controls</li>
+ <li>Separator lines to help visually organize groups of controls</li>
+ </ul>
+<li>Controls can generate callbacks when their values change</li>
+<li>Variables can be linked to controls and automatically updated when the value of the control changes (<I>"live variables"</I>)</li>
+<li>Controls can be automatically synchronized to reflect changes in live variables</li>
+<li>Controls can trigger GLUT redisplay events when their values change</li>
+<li>Layout and sizing of controls is automatic</li>
+<li>Controls can be grouped into columns</li>
+<li>User can cycle through controls using Tab key</li>
+</ul>
+
+<h3>What does GLUI look like?</h3>
+
+<p>
+Here's an example GLUI window, showing the different controls. This
+window is rendered entirely in OpenGL. It therefore looks the same on
+PCs, Macs, SGIs, and other Unixes, using either SGI's implementation
+of OpenGL, Microsoft's, or Mesa's.
+</p>
+
+<p align="center"><img src="image1.png" alt="GLUI OpenGL Interface" width="401" height="252" border="0"></p>
+
+<hr>
+
+<h3>New in Version 2</h3>
+
+<p>GLUI version 2 includes the following new features and controls:</p>
+
+<ul>
+<li>GLUI controls within the main graphics window.</li>
+<li>Functions for cleanly destroying GLUI windows and subwindows.</li>
+<li>Functions for hiding and showing GLUI windows and subwindows.</li>
+<li>A sync_live_all() for automatically synchronizing all live variables in all GLUI windows simultaneously.</li>
+<li>Rollouts - collapsible panels for reducing screen clutter.</li>
+<li>Listboxes - allows the user to choose an item from a list of strings.</li>
+<li>Rotation and translation controllers - for easily receiving 3D interaction input from the user.</li>
+</ul>
+
+<p>Here is a screenshot (from Windows) showing all the GLUI version 2.0 controls:</p>
+<p align="center"><img src="screen2.png" alt="Windows GLUI" width="548" height="315" border="0"></p>
+
+<p>And another screenshot (from X-Windows/Mwm), showing the new features, including
+GLUI subwindows docked inside the main graphics window.</p>
+<p align="center"><img src="screen3.png" alt="X-Windows GLUI" width="585" height="312" border="0"></p>
+
+<p>This screenshot (from Windows) shows the new widgets in GLUI 2.3, including
+scrollbars, a list widget, an area text widget, and a simple file browser.</p>
+<p align="center"><img src="screen4.png" alt="GLUI 2.3 Widgets" width="648" height="506" border="0"></p>
+
+<hr>
+
+<h3><A NAME="download">Download GLUI</a></h3>
+
+<p>Version 2.35</p>
+
+ <ul>
+ <li>Source: <a href="http://prdownloads.sourceforge.net/glui/glui_2.35.tgz?download">glui-2.35.tgz</a></li>
+ <li>Source: <a href="http://prdownloads.sourceforge.net/glui/glui-2.35.zip?download">glui-2.35.zip</a></li>
+ <li>OS X: <a href="http://lukecyca.com/wp-content/uploads/2007/02/GLUIFramework.pkg.tgz">GLUIFramework.pkg.tgz</a>
+ (<a href="http://lukecyca.com/2007/02/14/glui-23-framework-for-mac-os-x/">Packaged by Luke Cyca</a>)</li>
+ </ul>
+
+<p>Version 2.2</p>
+
+ <ul>
+ <li>Source: <a href="http://prdownloads.sourceforge.net/glui/glui_v2_2.tgz?download">glui_v2_2.tgz</a></li>
+ <li>Source: <a href="http://prdownloads.sourceforge.net/glui/glui_v2_2.zip?download">glui_v2_2.zip</a></li>
+ <li>DevPak: <a href="http://prdownloads.sourceforge.net/glui/glui.2.2-1.DevPak?download">glui.2.2-1.DevPak</a></li>
+ <li>Manual: <a href="http://prdownloads.sourceforge.net/glui/glui_manual_v2_beta.pdf?download">glui_manual_v2_beta.pdf</a></li>
+ </ul>
+
+<p>Files <a href="http://sourceforge.net/project/showfiles.php?group_id=92496"> hosted by SourceForge</a></p>
+
+<p> Versions previous to GLUI 2.2 <a href="http://www.cs.unc.edu/~rademach/glui/">are available</a>.</p>
+
+<hr>
+
+<h3>License Information</h3>
+
+<p>
+GLUI is licensed under <a HREF="http://www.gnu.org/copyleft/lesser.html">LGPL</a>.
+</p>
+
+<hr>
+
+<h3>Projects Using GLUI</h3>
+
+<ul>
+ <li><a href="http://doris.sourceforge.net/">Doris</a> - a script driven OpenGL viewer using Lua.</li>
+</ul>
+
+<hr>
+
+<h3>Wish List</h3>
+
+<ul>
+ <li>Convert documentation to LaTeX</li>
+ <li>Doxygen documentation</li>
+ <li>Feature request: Floating controls over a 3D canvas</li>
+</ul>
+
+<hr>
+
+<h3>Links</h3>
+
+<ul>
+<li>Paul Rademacher's <a href="http://www.cs.unc.edu/~rademach/glui/">original GLUI page</a>.</li>
+<li>GLUI <a href="http://freshmeat.net/projects/glui/">freshmeat</a> page.</li>
+<li><a href="http://www.opengl.org">OpenGL.org</a></li>
+</ul>
+
+</body>
+</html>
diff --git a/thirdparty/glui/2.35/www/screen2.png b/thirdparty/glui/2.36/www/screen2.png
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/www/screen2.png
rename to thirdparty/glui/2.36/www/screen2.png
diff --git a/thirdparty/glui/2.35/www/screen3.png b/thirdparty/glui/2.36/www/screen3.png
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/www/screen3.png
rename to thirdparty/glui/2.36/www/screen3.png
diff --git a/thirdparty/glui/2.36/www/screen4.png b/thirdparty/glui/2.36/www/screen4.png
new file mode 100644
index 0000000000000000000000000000000000000000..be9e9ccc1f099252819043acf84242de206914d4
Binary files /dev/null and b/thirdparty/glui/2.36/www/screen4.png differ
diff --git a/thirdparty/glui/2.35/www/title.jpg b/thirdparty/glui/2.36/www/title.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/www/title.jpg
rename to thirdparty/glui/2.36/www/title.jpg
diff --git a/thirdparty/glui/2.35/www/valid-html401.png b/thirdparty/glui/2.36/www/valid-html401.png
old mode 100755
new mode 100644
similarity index 100%
rename from thirdparty/glui/2.35/www/valid-html401.png
rename to thirdparty/glui/2.36/www/valid-html401.png