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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
a96980ab
Commit
a96980ab
authored
Sep 19, 2014
by
Thery Sylvain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve pb de cyclic dependencies in libraries
parent
0b676145
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
CMakeLists.txt
CMakeLists.txt
+9
-0
src/Utils/scene_graph.cpp
src/Utils/scene_graph.cpp
+2
-0
No files found.
CMakeLists.txt
View file @
a96980ab
...
...
@@ -303,9 +303,18 @@ ELSE()
ELSE
()
add_library
(
utils
${
files_utils
}
)
ENDIF
()
target_link_libraries
(
utils
${
CGoGN_EXT_LIBS
}
)
add_library
(
container
${
files_container
}
)
target_link_libraries
(
container utils
)
add_library
(
topology
${
files_topology
}
)
target_link_libraries
(
topology container
)
add_library
(
algo
${
files_algo
}
)
target_link_libraries
(
algo utils topology
)
add_custom_target
(
Geometry SOURCES
${
files_geometry
}
)
add_custom_target
(
ThirdParty SOURCES
${
files_thirdParty
}
)
add_dependencies
(
utils shader_target
)
...
...
src/Utils/scene_graph.cpp
View file @
a96980ab
...
...
@@ -191,6 +191,7 @@ void VBO_Node::render()
{
if
(
m_vbo
!=
NULL
)
{
/*
if (m_primitives & Algo::Render::GL2::TRIANGLES)
{
glEnable(GL_POLYGON_OFFSET_FILL);
...
...
@@ -223,6 +224,7 @@ void VBO_Node::render()
m_vbo->draw(m_current_material->getShader(), Algo::Render::GL2::POINTS);
glUseProgram(prg);
}
*/
// if (m_primitives & Algo::Render::GL2::FLAT_TRIANGLES)
// {
// glEnable(GL_POLYGON_OFFSET_FILL);
...
...
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