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
310a5445
Commit
310a5445
authored
20 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
add missing #ifdef HAVE_FLTK
parent
ef15149c
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
Plugin/StructuralSolver.cpp
+7
-6
7 additions, 6 deletions
Plugin/StructuralSolver.cpp
Plugin/StructuralSolver.h
+2
-0
2 additions, 0 deletions
Plugin/StructuralSolver.h
with
9 additions
and
6 deletions
Plugin/StructuralSolver.cpp
+
7
−
6
View file @
310a5445
...
...
@@ -86,7 +86,8 @@ void Structural_BeamSection :: computeGeometricalProperties ()
void
Structural_Texture
::
setup
()
{
#ifdef HAVE_FLTK
Fl_PNG_Image
image
(
filename
.
c_str
());
// allocate a texture name
...
...
@@ -118,19 +119,18 @@ void Structural_Texture::setup ()
GL_RGB
,
GL_UNSIGNED_BYTE
,
data
);
#endif
}
void
Structural_BeamSection
::
GL_DrawBeam
(
double
pinit
[
3
],
double
dir
[
3
],
const
double
dirz
[
3
],
Structural_Texture
&
texture
)
{
#ifdef HAVE_FLTK
if
(
texture
.
tag
==
0
)
{
texture
.
setup
();
}
#ifdef HAVE_FLTK
double
X
[
3
]
=
{
dir
[
0
],
dir
[
1
],
dir
[
2
]};
double
Z
[
3
]
=
{
dirz
[
0
],
dirz
[
1
],
dirz
[
2
]};
double
Y
[
3
];
...
...
@@ -634,6 +634,8 @@ void Draw_Kinematic_Constraint ( const int type [3],
const
double
pos
[
3
],
double
dir
[
3
])
{
#ifdef HAVE_FLTK
// presently, it's only 2D , 1st and second component are for dir and dir2
// and third one is for rotation around z
...
...
@@ -777,8 +779,7 @@ void Draw_Kinematic_Constraint ( const int type [3],
glDisable
(
GL_LIGHTING
);
glColor4ubv
((
GLubyte
*
)
&
CTX
.
color
.
geom
.
point
);
#endif
}
...
...
This diff is collapsed.
Click to expand it.
Plugin/StructuralSolver.h
+
2
−
0
View file @
310a5445
...
...
@@ -45,7 +45,9 @@ extern "C"
struct
Structural_Texture
{
std
::
string
filename
;
#ifdef HAVE_FLTK
GLuint
tag
;
#endif
void
setup
();
};
...
...
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