Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
1e81fb2a
Commit
1e81fb2a
authored
Feb 13, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
schnapps modif
parent
eb589834
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
15 deletions
+16
-15
CGoGN/src/Utils/GLSLShader.cpp
CGoGN/src/Utils/GLSLShader.cpp
+5
-3
CMakeLists.txt
CMakeLists.txt
+2
-7
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+8
-4
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+1
-1
No files found.
CGoGN/src/Utils/GLSLShader.cpp
View file @
1e81fb2a
...
...
@@ -39,14 +39,16 @@ namespace CGoGN
namespace
Utils
{
#ifdef USE_OGL_CORE_PROFILE
#ifdef
CGoGN_
USE_OGL_CORE_PROFILE
unsigned
int
GLSLShader
::
CURRENT_OGL_VERSION
=
3
;
unsigned
int
GLSLShader
::
MAJOR_OGL_CORE
=
3
;
unsigned
int
GLSLShader
::
MINOR_OGL_CORE
=
3
;
#else
unsigned
int
GLSLShader
::
CURRENT_OGL_VERSION
=
2
;
unsigned
int
GLSLShader
::
MAJOR_OGL_CORE
=
2
;
unsigned
int
GLSLShader
::
MINOR_OGL_CORE
=
1
;
#endif
unsigned
int
GLSLShader
::
MAJOR_OGL_CORE
=
3
;
unsigned
int
GLSLShader
::
MINOR_OGL_CORE
=
3
;
std
::
string
GLSLShader
::
DEFINES_GL2
=
\
...
...
CMakeLists.txt
View file @
1e81fb2a
...
...
@@ -19,8 +19,7 @@ SET ( CGoGN_WITH_ASSIMP OFF CACHE BOOL "build CGoGN with Assimp" )
SET
(
CGoGN_WITH_ZINRI OFF CACHE BOOL
"build CGoGN with Zinri lib"
)
SET
(
CGoGN_WITH_QT ON CACHE BOOL
"build CGoGN with Qt lib"
)
SET
(
DESIRED_QT_VERSION
"4"
CACHE STRING
"4: QT4/ 5 not yet implemented"
)
SET
(
CGoGN_WITH_PYTHONQT ON CACHE BOOL
"build PythonQt (for Schnapps)"
)
SET
(
CGoGN_WITH_GLEWMX OFF CACHE BOOL
"use multi-contex GLEW"
)
SET
(
CGoGN_WITH_GLEWMX OFF CACHE BOOL
"use multi-contex GLEW (for VRJuggler)"
)
SET
(
CGoGN_USE_OGL_CORE_PROFILE OFF CACHE BOOL
"use OpenGL 3.3 core profile (do not work on mac)"
)
SET
(
CGoGN_COMPILE_EXAMPLES OFF CACHE BOOL
"compile examples"
)
...
...
@@ -93,7 +92,7 @@ endif()
add_definitions
(
"-DCGOGN_ASSERT_BOOL=
${
ASSERT_ACTIVED
}
"
)
IF
(
CGoGN_USE_OGL_CORE_PROFILE
)
add_definitions
(
"-DUSE_OGL_CORE_PROFILE=1"
)
add_definitions
(
"-D
CGoGN_
USE_OGL_CORE_PROFILE=1"
)
ENDIF
()
add_definitions
(
"-DGLM_FORCE_RADIANS"
)
...
...
@@ -122,10 +121,6 @@ INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/ThirdParty/include)
ADD_SUBDIRECTORY
(
ThirdParty/Tools
)
IF
(
CGoGN_WITH_PYTHONQT
)
ADD_SUBDIRECTORY
(
ThirdParty/PythonQt
)
ENDIF
()
ADD_SUBDIRECTORY
(
ThirdParty/OpenNL
)
INCLUDE_DIRECTORIES
(
${
CGoGN_ROOT_DIR
}
/ThirdParty/OpenNL/src
)
...
...
SCHNApps/CMakeLists.txt
View file @
1e81fb2a
...
...
@@ -41,11 +41,15 @@ SET( QT_USE_QTSVG TRUE )
INCLUDE
(
${
QT_USE_FILE
}
)
ADD_DEFINITIONS
(
${
QT_DEFINITIONS
}
)
add_definitions
(
-DGLM_FORCE_RADIANS
)
#MESSAGE HERE FOR MORE EASY READING (MESSAGE AT THE END)
MESSAGE
(
"Build type = "
${
CMAKE_BUILD_TYPE
}
" (for change -DCMAKE_BUILD_TYPE=Release|Debug)"
)
# PythonQt dependency
ADD_SUBDIRECTORY
(
${
CGoGN_ROOT_DIR
}
/ThirdParty/PythonQt ThirdParty_PythonQt
)
# for GLM
add_definitions
(
-DGLM_FORCE_RADIANS
)
# CGoGN compiled in one or several libs
file
(
STRINGS
${
CGoGN_SRC_DIR
}
/include/cgogn_onelib.h ONELIB_STR
)
IF
(
ONELIB_STR EQUAL 1
)
SET
(
CGoGN_LIBS cgogn
)
...
...
@@ -53,12 +57,12 @@ ELSE()
SET
(
CGoGN_LIBS topology algo container utils
)
ENDIF
()
# use GL core profile 3.3
file
(
STRINGS
${
CGoGN_SRC_DIR
}
/include/cgogn_coreprofile.h COREPROFILE_STR
)
IF
(
COREPROFILE_STR EQUAL 1
)
add_definitions
(
-DCGoGN_USE_OGL_CORE_PROFILE=1
)
ENDIF
()
add_definitions
(
-DCGOGN_ASSERT_BOOL=
${
CGoGN_ASSERT_ACTIVED
}
)
IF
(
CGoGN_SLOT_DEBUG_MODE
)
...
...
SCHNApps/src/schnapps.cpp
View file @
1e81fb2a
...
...
@@ -44,7 +44,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
{
GenericMap
::
initAllStatics
(
&
m_sp
);
#ifdef USE_OGL_CORE_PROFILE
#ifdef
CGoGN_
USE_OGL_CORE_PROFILE
CGoGN
::
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
3
);
#else
CGoGN
::
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment