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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
2ce62b2a
Commit
2ce62b2a
authored
14 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
more tweaks for 64 bit mac version
parent
0537b0a2
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Fltk/FlGui.cpp
+0
-8
0 additions, 8 deletions
Fltk/FlGui.cpp
Graphics/drawContext.cpp
+10
-0
10 additions, 0 deletions
Graphics/drawContext.cpp
Graphics/drawPost.cpp
+8
-2
8 additions, 2 deletions
Graphics/drawPost.cpp
with
18 additions
and
10 deletions
Fltk/FlGui.cpp
+
0
−
8
View file @
2ce62b2a
...
...
@@ -185,14 +185,6 @@ FlGui::FlGui(int argc, char **argv)
// set default font size
FL_NORMAL_SIZE
=
drawContext
::
global
()
->
getFontSize
();
#if defined(__APPLE__) && defined(HAVE_64BIT_SIZE_T)
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
int
numStrings
=
1000
;
if
(
gl_texture_pile_height
()
<
numStrings
)
gl_texture_pile_height
(
numStrings
);
#endif
#endif
// handle themes and tooltip font size
if
(
CTX
::
instance
()
->
guiTheme
.
size
())
Fl
::
scheme
(
CTX
::
instance
()
->
guiTheme
.
c_str
());
...
...
This diff is collapsed.
Click to expand it.
Graphics/drawContext.cpp
+
10
−
0
View file @
2ce62b2a
...
...
@@ -21,6 +21,7 @@
#if defined(HAVE_FLTK)
#include
<FL/Fl_JPEG_Image.H>
#include
<FL/Fl_PNG_Image.H>
#include
<FL/gl.h>
#endif
drawContextGlobal
*
drawContext
::
_global
=
0
;
...
...
@@ -252,6 +253,15 @@ void drawContext::draw3d()
else
CTX
::
instance
()
->
polygonOffset
=
0
;
// speedup drawing of textured fonts on cocoa mac version
#if defined(HAVE_FLTK) && defined(__APPLE__) && defined(HAVE_64BIT_SIZE_T)
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
int
numStrings
=
GModel
::
current
()
->
getNumVertices
();
if
(
gl_texture_pile_height
()
<
numStrings
)
gl_texture_pile_height
(
numStrings
);
#endif
#endif
glDepthFunc
(
GL_LESS
);
glEnable
(
GL_DEPTH_TEST
);
initProjection
();
...
...
This diff is collapsed.
Click to expand it.
Graphics/drawPost.cpp
+
8
−
2
View file @
2ce62b2a
...
...
@@ -5,6 +5,7 @@
#include
<math.h>
#include
<algorithm>
#include
"GmshConfig.h"
#include
"GmshMessage.h"
#include
"drawContext.h"
#include
"PView.h"
...
...
@@ -16,6 +17,11 @@
#include
"Context.h"
#include
"gl2ps.h"
#if defined(HAVE_FLTK)
#include
<FL/Fl.H>
#include
<FL/gl.H>
#endif
static
void
drawArrays
(
drawContext
*
ctx
,
PView
*
p
,
VertexArray
*
va
,
GLint
type
,
bool
useNormalArray
)
{
...
...
@@ -273,8 +279,8 @@ static void drawGlyphs(drawContext *ctx, PView *p)
Msg
::
Debug
(
"drawing extra glyphs (this is slow...)"
);
// speed
-
up
string
drawing
with cocoa fltk
#if defined(__APPLE__) && defined(HAVE_64BIT_SIZE_T)
// speedup drawing
of textured fonts on cocoa mac version
#if
defined(HAVE_FLTK) &&
defined(__APPLE__) && defined(HAVE_64BIT_SIZE_T)
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
if
(
opt
->
intervalsType
==
PViewOptions
::
Numeric
){
int
numStrings
=
0
;
...
...
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