Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
029f4476
Commit
029f4476
authored
10 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
cleanup
parent
d177ff58
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/mobile/drawContext.cpp
+5
-9
5 additions, 9 deletions
contrib/mobile/drawContext.cpp
contrib/mobile/drawContext.h
+1
-4
1 addition, 4 deletions
contrib/mobile/drawContext.h
with
6 additions
and
13 deletions
contrib/mobile/drawContext.cpp
+
5
−
9
View file @
029f4476
...
...
@@ -62,10 +62,7 @@ drawContext::drawContext(float fontFactor, bool retina)
_translate
[
i
]
=
0.
;
_scale
[
i
]
=
1.
;
}
setQuaternion
(
0.
,
0.
,
0.
,
1.
);
_fillMesh
=
false
;
_gradiant
=
true
;
setQuaternion
(
0.
,
0.
,
0.
,
1.
);
_fontFactor
=
fontFactor
;
_retina
=
retina
;
}
...
...
@@ -598,7 +595,7 @@ void drawContext::drawView()
glMatrixMode
(
GL_MODELVIEW
);
// fill the background
glClear
(
GL_COLOR_BUFFER_BIT
|
GL_DEPTH_BUFFER_BIT
);
if
(
_g
radi
a
nt
){
if
(
CTX
::
instance
()
->
bgG
radi
e
nt
){
glPushMatrix
();
glLoadIdentity
();
const
GLfloat
squareVertices
[]
=
{
...
...
@@ -628,7 +625,7 @@ void drawContext::drawView()
glScalef
(
_scale
[
0
],
_scale
[
1
],
_scale
[
2
]);
glTranslatef
(
_translate
[
0
],
_translate
[
1
],
_translate
[
2
]);
if
(
CTX
::
instance
()
->
rotationCenterCg
)
if
(
CTX
::
instance
()
->
rotationCenterCg
)
glTranslatef
(
CTX
::
instance
()
->
cg
[
0
],
CTX
::
instance
()
->
cg
[
1
],
CTX
::
instance
()
->
cg
[
2
]);
...
...
@@ -637,7 +634,7 @@ void drawContext::drawView()
CTX
::
instance
()
->
rotationCenter
[
1
],
CTX
::
instance
()
->
rotationCenter
[
2
]);
buildRotationMatrix
();
buildRotationMatrix
();
glMultMatrixf
(
_rotatef
);
if
(
CTX
::
instance
()
->
rotationCenterCg
)
...
...
@@ -649,7 +646,7 @@ void drawContext::drawView()
-
CTX
::
instance
()
->
rotationCenter
[
1
],
-
CTX
::
instance
()
->
rotationCenter
[
2
]);
checkGlError
(
"Initialize position"
);
checkGlError
(
"Initialize position"
);
glEnable
(
GL_DEPTH_TEST
);
drawMesh
();
...
...
@@ -760,7 +757,6 @@ int onelab_cb(std::string action)
}
while
(
action
==
"compute"
&&
!
onelabStop
&&
(
onelabUtils
::
incrementLoop
(
"3"
)
||
onelabUtils
::
incrementLoop
(
"2"
)
||
onelabUtils
::
incrementLoop
(
"1"
)));
locked
=
false
;
return
redraw
;
}
...
...
This diff is collapsed.
Click to expand it.
contrib/mobile/drawContext.h
+
1
−
4
View file @
029f4476
...
...
@@ -37,10 +37,8 @@ private:
int
_width
,
_height
;
// size of OpenGL context in pixel
float
_left
,
_right
,
_top
,
_bottom
,
_far
;
// value of "border"
float
_fontFactor
;
bool
_gradiant
;
// show the background gradiant
bool
_fillMesh
;
// fill the Mesh
bool
_retina
;
// retina display
void
OrthofFromGModel
(
void
);
void
drawPView
(
PView
*
p
);
void
drawVectorArray
(
PViewOptions
*
opt
,
VertexArray
*
va
);
...
...
@@ -63,7 +61,6 @@ public:
void
drawMesh
();
void
drawPost
();
void
drawScale
();
void
useGradiant
(
bool
gradiant
=
true
)
{
_gradiant
=
gradiant
;}
};
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment