Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ofxaddons
ofxCloudLib
Commits
4472954a
Commit
4472954a
authored
Sep 30, 2017
by
alexandre burton
Browse files
Merger: ajustement au dessin
parent
7e6a3d38
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ofxCloudLib/Merger.hpp
View file @
4472954a
...
...
@@ -78,6 +78,11 @@ class Merger
scene_model_
.
disableMaterials
();
scene_model_
.
disableTextures
();
marqueurs_model_
.
disableColors
();
marqueurs_model_
.
disableMaterials
();
marqueurs_model_
.
disableTextures
();
if
(
marqueurs_model_
.
hasMeshes
())
{
std
::
cout
<<
"marqueurs_model_ #meshes: "
<<
marqueurs_model_
.
getNumMeshes
()
<<
std
::
endl
;
}
...
...
@@ -125,13 +130,13 @@ class Merger
// light_court_.enable();
ofPushStyle
();
ofPushMatrix
();
ofSetColor
(
255
,
255
,
255
,
100
);
ofSetColor
(
128
,
128
,
128
,
100
);
ofRotateDeg
(
180
,
1
,
0
,
0
);
ofScale
(
1000
);
ofRotateDeg
(
180
,
1
,
0
,
0
);
ofScale
(
1000
);
if
(
wireframe_models_
)
{
if
(
wireframe_models_
)
{
scene_model_
.
drawWireframe
();
}
else
{
// model_material_.begin();
...
...
@@ -171,7 +176,7 @@ class Merger
// light_court_.disable();
// ofDisableLighting();
ofSetColor
(
255
,
255
,
255
,
15
0
);
ofSetColor
(
255
,
255
,
255
,
20
0
);
ofEnableBlendMode
(
OF_BLENDMODE_ADD
);
marqueurs_model_
.
drawWireframe
();
}
...
...
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