FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23 from vlajos/typofixes-vlajos-20141204

Browse Source
This commit is contained in:
Diederick C. Niehorster 2014-12-23 00:25:49 +08:00
commit c95a80d7e6
14 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
freeglut/freeglut/ChangeLog
View File

@ -755,7 +755,7 @@
2005-06-30 Sven Panne <sven.panne@aedion.de> 2005-06-30 Sven Panne <sven.panne@aedion.de>
* src/freeglut_main.c: Ooops, forgot to set the current window in the * src/freeglut_main.c: Ooops, forgot to set the current window in the
last commit. I'll have to test better before comitting... :-] last commit. I'll have to test better before committing... :-]
* ChangeLog, src/freeglut_main.c: When a window is iconified, only an * ChangeLog, src/freeglut_main.c: When a window is iconified, only an
UnmapNotify is sent, not a VisibilityNotify, so we have to handle the UnmapNotify is sent, not a VisibilityNotify, so we have to handle the
window status callback in the former case, too. This fixes bug #763442 window status callback in the former case, too. This fixes bug #763442
@ -814,7 +814,7 @@
2005-06-02 James Jones <puggles@users.sourceforge.net> 2005-06-02 James Jones <puggles@users.sourceforge.net>
* ChangeLog, configure.ac, src/freeglut_internal.h: 2.4.0 Release * ChangeLog, configure.ac, src/freeglut_internal.h: 2.4.0 Release
Candiate 5 Candidate 5
2005-05-26 John F. Fay <john.fay.ctr@eglin.af.mil> 2005-05-26 John F. Fay <john.fay.ctr@eglin.af.mil>
@ -859,7 +859,7 @@
* src/freeglut_gamemode.c: Fixed SF bug #1204256: Off-by-one error in * src/freeglut_gamemode.c: Fixed SF bug #1204256: Off-by-one error in
X11 mode switching. The code which changes the X11 video mode has an X11 mode switching. The code which changes the X11 video mode has an
off-by-one error, resulting in a wrong mode or segfault. I've off-by-one error, resulting in a wrong mode or segfault. I've
refactored the code slighty to make it hopefully clearer what's going refactored the code slightly to make it hopefully clearer what's going
on and corrected some #ifdefs on the way. Now at least the "One" demo on and corrected some #ifdefs on the way. Now at least the "One" demo
works for me. works for me.
* src/freeglut_window.c: Fixed SF bug #1204261: Mini space leak when * src/freeglut_window.c: Fixed SF bug #1204261: Mini space leak when
@ -927,7 +927,7 @@
* src/freeglut_joystick.c: Removing an unused function * src/freeglut_joystick.c: Removing an unused function
* src/freeglut_init.c: Making the \"key repeat\" initialization * src/freeglut_init.c: Making the \"key repeat\" initialization
consistent with the rest of its usage; also making the consistent with the rest of its usage; also making the
\"initDisplayString\" ever-so-slightly mroe general \"initDisplayString\" ever-so-slightly more general
* ChangeLog, TODO, src/freeglut_window.c: Updating the ChangeLog and * ChangeLog, TODO, src/freeglut_window.c: Updating the ChangeLog and
TODO files in preparation for the upcoming release TODO files in preparation for the upcoming release
@ -1419,7 +1419,7 @@
* src/freeglut_callbacks.c: Fixed the bug where glutDisplayFunc() was * src/freeglut_callbacks.c: Fixed the bug where glutDisplayFunc() was
effectively invoking glutPostRedsiplay(). This is wrong on the face of effectively invoking glutPostRedsiplay(). This is wrong on the face of
it, and may be at root for some of the annoying "timing" issues we've it, and may be at root for some of the annoying "timing" issues we've
had with redisplay events being called inappopriately. had with redisplay events being called inappropriately.
2004-02-19 rkrolib 2004-02-19 rkrolib
@ -1506,7 +1506,7 @@
functions are modified to respect offscreen status. functions are modified to respect offscreen status.
(Excepting reshaping windows, there is not much useful interpretation (Excepting reshaping windows, there is not much useful interpretation
for managment of offscreen areas. Reshaping is possibly more work than for management of offscreen areas. Reshaping is possibly more work than
it's worth to support, and GLUT specs allow us to ignore the request.) it's worth to support, and GLUT specs allow us to ignore the request.)
* Cleanup for "offscreen" windows is a little different than for * Cleanup for "offscreen" windows is a little different than for
@ -1533,7 +1533,7 @@
2004-01-16 rkrolib 2004-01-16 rkrolib
* src/freeglut_main.c: Ammended a comment on fgCheckJoystickCallback(). * src/freeglut_main.c: Amended a comment on fgCheckJoystickCallback().
* src/freeglut_main.c: Minor style normalizations to minimize the diffs * src/freeglut_main.c: Minor style normalizations to minimize the diffs
between *now* and from before John's changes. No functional changes: between *now* and from before John's changes. No functional changes:
@ -1563,7 +1563,7 @@
* src/freeglut_main.c, src/freeglut_menu.c, src/freeglut_structure.c: * src/freeglut_main.c, src/freeglut_menu.c, src/freeglut_structure.c:
Split a few overlong lines. Split a few overlong lines.
Adjusted some spacing in a few spots to be more consistant with Adjusted some spacing in a few spots to be more consistent with
freeglut style. Including one unindented if() body. freeglut style. Including one unindented if() body.
Eliminated a dead variable. Eliminated a dead variable.
@ -1779,7 +1779,7 @@
(which during general display callback handling would result in (which during general display callback handling would result in
effectively a glutReshapeWindow()). effectively a glutReshapeWindow()).
The code is now system-dependant. It should be abstracted to a The code is now system-dependent. It should be abstracted to a
function, but is presently copied in two places. Sorry. function, but is presently copied in two places. Sorry.
Also, inverted the order of the associated if()/else check (in both Also, inverted the order of the associated if()/else check (in both
@ -2033,7 +2033,7 @@
file. file.
NOTE: The prior version of the *.dsw file does not in fact have CRs. I NOTE: The prior version of the *.dsw file does not in fact have CRs. I
thought that it did. For consistancy, I am not putting them in in this thought that it did. For consistency, I am not putting them in in this
version, either. (At least one person said that his MSVC++ system is version, either. (At least one person said that his MSVC++ system is
happy with the current files. If there are problems, we can easily add happy with the current files. If there are problems, we can easily add
the CRs, but that should be a separate commit...) the CRs, but that should be a separate commit...)
@ -2099,14 +2099,14 @@
* src/freeglut_menu.c: A first pass over freeglut_menu.c to bring it in * src/freeglut_menu.c: A first pass over freeglut_menu.c to bring it in
line with the rest of freeglut's style. Mostly re-indenting and line with the rest of freeglut's style. Mostly re-indenting and
splitting long lines. For those that may be concerned: No, I didn't do splitting long lines. For those that may be concerned: No, I didn't do
any more arrangments of the form (CONST == a) rather than (a == any more arrangements of the form (CONST == a) rather than (a ==
CONST). (^& CONST). (^&
* progs/demos/Fractals_random/fractals_random.c: Altered the way that * progs/demos/Fractals_random/fractals_random.c: Altered the way that
the {random} value (from 0..3) is chosen. the {random} value (from 0..3) is chosen.
Previously, it picked out two adjacent bits in the result of rand(). Previously, it picked out two adjacent bits in the result of rand().
Unfortunately, these adjacent bits (at least on NetBSD) have a certain Unfortunately, these adjacent bits (at least on NetBSD) have a certain
amount of dependance. After a period (perhaps a thousand or so?), it amount of dependence. After a period (perhaps a thousand or so?), it
starts to repeat the pattern of those two bits. (I think; I haven't starts to repeat the pattern of those two bits. (I think; I haven't
actually tested that directly.) This presumably is locking it into a actually tested that directly.) This presumably is locking it into a
an an N-way attractor on the "snowflake", such that if you zoom in a an an N-way attractor on the "snowflake", such that if you zoom in a
@ -2116,7 +2116,7 @@
What I've done now is to pick up two widely-spaced bits in a single What I've done now is to pick up two widely-spaced bits in a single
rand() call. (Perhaps we would do as well to pick up something like rand() call. (Perhaps we would do as well to pick up something like
bit #16 from two consecutive rand() calls?) These widely-spaced bits bit #16 from two consecutive rand() calls?) These widely-spaced bits
have a lower statistical dependance on one another (if I can get away have a lower statistical dependence on one another (if I can get away
with using that term for an arithmetic operation; though since stats with using that term for an arithmetic operation; though since stats
has more to do with sampling and less to do with true randomness, I has more to do with sampling and less to do with true randomness, I
may be safe). may be safe).
@ -2194,7 +2194,7 @@
* Don't write a == CONST. Instead, write CONST == a. Or, more * Don't write a == CONST. Instead, write CONST == a. Or, more
generally (in C like languages): Avoid putting an lvalue on the generally (in C like languages): Avoid putting an lvalue on the
left-hand side of an == comparison. (For consistancy, I try to avoid left-hand side of an == comparison. (For consistency, I try to avoid
lvalues on the left- hand side of any comparison---but == is the most lvalues on the left- hand side of any comparison---but == is the most
notorious.) notorious.)
@ -2314,7 +2314,7 @@
* src/freeglut_main.c: Missed a block where one level was 2-space * src/freeglut_main.c: Missed a block where one level was 2-space
indented. indented.
Nit-picked a few other lines for consistancy. Nit-picked a few other lines for consistency.
2003-11-03 rkrolib 2003-11-03 rkrolib
@ -2379,9 +2379,9 @@
* src/freeglut_window.c: Missed a few say-nothing-new comments in * src/freeglut_window.c: Missed a few say-nothing-new comments in
fgOpenWindow(). Eeep. Should be better now. (^& fgOpenWindow(). Eeep. Should be better now. (^&
* src/freeglut_window.c: Cleansed fgCloseWindow(): * say-nothing-new * src/freeglut_window.c: Cleansed fgCloseWindow(): * say-nothing-new
comments axed. * de-TABbed. * Made the white-space to be consistant. comments axed. * de-TABbed. * Made the white-space to be consistent.
* src/freeglut_window.c: Cleaned up fgOpenWindow(): * Removed TABs. * * src/freeglut_window.c: Cleaned up fgOpenWindow(): * Removed TABs. *
Made indentation consistant. * Deleted say-nothing-new comments. * Made indentation consistent. * Deleted say-nothing-new comments. *
Changed an *error*check* from an assert to an if(). (The error-check Changed an *error*check* from an assert to an if(). (The error-check
was on window creation; we don't want to lose that if the user was on window creation; we don't want to lose that if the user
compiles with asserts deactivated. Also, assert()s really tell us more compiles with asserts deactivated. Also, assert()s really tell us more
@ -2390,14 +2390,14 @@
depend upon assert()s never being compiled away to null statements.) * depend upon assert()s never being compiled away to null statements.) *
Added some XXX comments for things that bear some rumination. Added some XXX comments for things that bear some rumination.
* src/freeglut_window.c: Cleanup to fgSetWindow(). The usual suspects: * * src/freeglut_window.c: Cleanup to fgSetWindow(). The usual suspects: *
Removed tabs. * Made indentation consistant. * Killed off Removed tabs. * Made indentation consistent. * Killed off
say-nothing-new comments. say-nothing-new comments.
* src/freeglut_window.c: Cleanup to fgSetupixelFormat(). Should be no * src/freeglut_window.c: Cleanup to fgSetupixelFormat(). Should be no
functional changes. functional changes.
Code facelift included: Code facelift included:
* Consistant indentation. * Removal of all TABs (there were a bunch). * Consistent indentation. * Removal of all TABs (there were a bunch).
* Fit to 80 columns. * Fit to 80 columns.
* src/freeglut_window.c: There should be no changes to code * src/freeglut_window.c: There should be no changes to code
functionality, though a fair bit of little changes to the code functionality, though a fair bit of little changes to the code
@ -2430,7 +2430,7 @@
In short, the code still has some issues, but I think that it's a bit In short, the code still has some issues, but I think that it's a bit
better. better.
(Oh, I also got rid of oustanding TABs.) (Oh, I also got rid of outstanding TABs.)
* src/freeglut_structure.c: Eliminated most of the say-nothing-new * src/freeglut_structure.c: Eliminated most of the say-nothing-new
comments. comments.
@ -2487,7 +2487,7 @@
mode does it. It's not ideal but it works. The glutGet() for the mode does it. It's not ideal but it works. The glutGet() for the
window border sizes will also have to be fixed at some point. window border sizes will also have to be fixed at some point.
* src/freeglut_window.c: Rewrote glutFullscreen(). It now correctly * src/freeglut_window.c: Rewrote glutFullscreen(). It now correctly
places the window in X11. It now uses system dependant code for more places the window in X11. It now uses system dependent code for more
efficient use of windowing system calls. efficient use of windowing system calls.
2003-10-29 rkrolib 2003-10-29 rkrolib
@ -2497,7 +2497,7 @@
I missed a few lines that went past 80 columns. (^& I missed a few lines that went past 80 columns. (^&
Also made formatting more consistant. Also made formatting more consistent.
Added a couple of XXX comments re. FreeBSD vs. general BSD #ifdef's. Added a couple of XXX comments re. FreeBSD vs. general BSD #ifdef's.
* src/freeglut_joystick.c: Should be entirely superficial changes to * src/freeglut_joystick.c: Should be entirely superficial changes to
@ -2505,7 +2505,7 @@
* Fit lines to 80 columns. (It does get tiresome seeing long lines * Fit lines to 80 columns. (It does get tiresome seeing long lines
forced to break by the right-hand border of windows...(^&) * forced to break by the right-hand border of windows...(^&) *
Eliminated say-nothing-new comments. * Made formatting more consistant Eliminated say-nothing-new comments. * Made formatting more consistent
in spots. * Eliminated some hard TAB characters. in spots. * Eliminated some hard TAB characters.
* src/freeglut_joystick.c: Added Thierry's change to include * src/freeglut_joystick.c: Added Thierry's change to include
sys/param.h. This lets us pick out version numbers for OS releases sys/param.h. This lets us pick out version numbers for OS releases
@ -2535,7 +2535,7 @@
Cleanup of fghGetConfig(). (One return statement, simpler code.) Cleanup of fghGetConfig(). (One return statement, simpler code.)
Made glutSetOption() have a more consistant style---and also got its Made glutSetOption() have a more consistent style---and also got its
lines to stay under 80 columns. lines to stay under 80 columns.
* src/freeglut_misc.c: Got the last of the say-nothing-new comments in * src/freeglut_misc.c: Got the last of the say-nothing-new comments in
freeglut_misc.c. freeglut_misc.c.
@ -2580,7 +2580,7 @@
was strangely formatted to the point that it seemed completely out of was strangely formatted to the point that it seemed completely out of
place, so I took the liberty of reformatting it. Since I used GNU place, so I took the liberty of reformatting it. Since I used GNU
EMACS's <tab> key (which re-indents rather than inserts TAB EMACS's <tab> key (which re-indents rather than inserts TAB
characters), I had to propogate some indentation changes a little characters), I had to propagate some indentation changes a little
further than the bare necessity to match up with John's changes. (John further than the bare necessity to match up with John's changes. (John
seems to shoot for 2-space indents, while EMACS (and I, I confess) seems to shoot for 2-space indents, while EMACS (and I, I confess)
strongly prefer 4-space indents. The code that I was re-indenting had strongly prefer 4-space indents. The code that I was re-indenting had
@ -2636,7 +2636,7 @@
* Expanded a comment re. some #define macros. * Expanded a comment re. some #define macros.
* Made colors and font choice system dependant. The UNIX freeglut * Made colors and font choice system dependent. The UNIX freeglut
menus look more like UNIX GLUT menus, now. (This is PURELY a cosmetic menus look more like UNIX GLUT menus, now. (This is PURELY a cosmetic
change. But it achieves better compatibility visually.) change. But it achieves better compatibility visually.)
* src/freeglut_main.c: Cleaned up glutMainLoop() a bit: * src/freeglut_main.c: Cleaned up glutMainLoop() a bit:
@ -2650,7 +2650,7 @@
into glutMainLoopEvent() for some reason. into glutMainLoopEvent() for some reason.
If the X11 code could be tucked into another function, If the X11 code could be tucked into another function,
glutMainLoopEvent() could be platform-independant. glutMainLoopEvent() could be platform-independent.
2003-10-26 rkrolib 2003-10-26 rkrolib
@ -2798,7 +2798,7 @@
Removed depth-buffer usage. (Also done for Fractals in previous Removed depth-buffer usage. (Also done for Fractals in previous
commit...) commit...)
* progs/demos/Fractals/fractals.c: A few minor changes: * glutInit*() * progs/demos/Fractals/fractals.c: A few minor changes: * glutInit*()
calls should preceed glutInit(), per se, generally. This is so that calls should precede glutInit(), per se, generally. This is so that
glutInit()'s configuration (which picks up on user parameters) can glutInit()'s configuration (which picks up on user parameters) can
override application defaults. * glutInit() should be called before override application defaults. * glutInit() should be called before
ANY attempt to process {argv, argc}. This is because there may be ANY attempt to process {argv, argc}. This is because there may be
@ -2825,7 +2825,7 @@
this fix). this fix).
I did not touch the Microsoft side, because I don't know what their OS I did not touch the Microsoft side, because I don't know what their OS
does---nor if old GLUT was historically system-dependant about this. does---nor if old GLUT was historically system-dependent about this.
2003-10-08 Eric Sandall 2003-10-08 Eric Sandall
@ -2839,7 +2839,7 @@
The broad outlines are: The broad outlines are:
* Color schemes are now in variables, are closer to old GLUT, and are * Color schemes are now in variables, are closer to old GLUT, and are
system dependant (as old GLUT did). * You can change the font to any system dependent (as old GLUT did). * You can change the font to any
bitmapped font more easily, which can aid in finding a better bitmapped font more easily, which can aid in finding a better
approximation. (Old GLUT does not seem to have used a GLUT font for approximation. (Old GLUT does not seem to have used a GLUT font for
the menus, which causes problems for us.) The menus rescale the menus, which causes problems for us.) The menus rescale
@ -3138,7 +3138,7 @@
* configure.in, src/Makefile.am, src/freeglut_glutfont_definitions.c, * configure.in, src/Makefile.am, src/freeglut_glutfont_definitions.c,
src/freeglut_internal.h: Added autoconf detection for the xf86 vid src/freeglut_internal.h: Added autoconf detection for the xf86 vid
mode extentions. mode extensions.
2003-08-01 Eric Sandall 2003-08-01 Eric Sandall
@ -3713,7 +3713,7 @@
freeglut-1.3/freeglut_structure.c, freeglut-1.3/freeglut_window.c, freeglut-1.3/freeglut_structure.c, freeglut-1.3/freeglut_window.c,
genfonts/Makefile.am, genfonts/genfonts.c, genfonts/genstroke.c, genfonts/Makefile.am, genfonts/genfonts.c, genfonts/genstroke.c,
include/GL/freeglut.h, include/GL/freeglut_internal.h: Removed glib include/GL/freeglut.h, include/GL/freeglut_internal.h: Removed glib
dependancy dependency
* configure.in, freeglut-1.3/Makefile.am, genfonts/Makefile.am: The * configure.in, freeglut-1.3/Makefile.am, genfonts/Makefile.am: The
build system now looks for X. build system now looks for X.

2
freeglut/freeglut/doc/freeglut.html
View File

@ -70,7 +70,7 @@ feature hints from opengl-gamedev-l readers have been added.
<p>Somebody (Chris?) hinted me that the stroke fonts can be found in the XFree86 <p>Somebody (Chris?) hinted me that the stroke fonts can be found in the XFree86
sources. I browsed through it and -- presto. Now I only need to define the stroke fonts sources. I browsed through it and -- presto. Now I only need to define the stroke fonts
structure (should be very similiar to bitmapped one) and write quite a simple parser. structure (should be very similar to bitmapped one) and write quite a simple parser.
<p>I've spent the (late) evening doing the init display string parsing and making <p>I've spent the (late) evening doing the init display string parsing and making
my logics classes homework :) Both is harder than I primarily thought, but fortunately my logics classes homework :) Both is harder than I primarily thought, but fortunately

2
freeglut/freeglut/src/egl/fg_state_egl.c
View File

@ -82,7 +82,7 @@ int fghPlatformGlutGetEGL ( GLenum eWhat )
return fghChooseConfig(&config); return fghChooseConfig(&config);
} }
/* This is system-dependant */ /* This is system-dependent */
case GLUT_WINDOW_FORMAT_ID: case GLUT_WINDOW_FORMAT_ID:
if( fgStructure.CurrentWindow == NULL ) if( fgStructure.CurrentWindow == NULL )
return 0; return 0;

2
freeglut/freeglut/src/egl/fg_window_egl.c
View File

@ -38,7 +38,7 @@ int fghChooseConfig(EGLConfig* config) {
if (fgState.MajorVersion >= 2) { if (fgState.MajorVersion >= 2) {
/* /*
* Khronos does not specify a EGL_OPENGL_ES3_BIT outside of the OpenGL extension "EGL_KHR_create_context" and EGL 1.5. There are numerous references on the internet * Khronos does not specify a EGL_OPENGL_ES3_BIT outside of the OpenGL extension "EGL_KHR_create_context" and EGL 1.5. There are numerous references on the internet
* that say to use EGL_OPENGL_ES3_BIT (pre-EGL 1.5), followed by many saying they can't find it in any headers. In fact, the offical updated specification for EGL * that say to use EGL_OPENGL_ES3_BIT (pre-EGL 1.5), followed by many saying they can't find it in any headers. In fact, the official updated specification for EGL
* does not have any references to OpenGL ES 3.x. Tests have shown that EGL_OPENGL_ES2_BIT will work with ES 3.x. * does not have any references to OpenGL ES 3.x. Tests have shown that EGL_OPENGL_ES2_BIT will work with ES 3.x.
*/ */
ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT); ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT);

6
freeglut/freeglut/src/fg_internal.h
View File

@ -378,7 +378,7 @@ struct tagSFG_Timer
/* /*
* A window and its OpenGL context. The contents of this structure * A window and its OpenGL context. The contents of this structure
* are highly dependant on the target operating system we aim at... * are highly dependent on the target operating system we aim at...
*/ */
typedef struct tagSFG_Context SFG_Context; typedef struct tagSFG_Context SFG_Context;
struct tagSFG_Context struct tagSFG_Context
@ -902,7 +902,7 @@ extern SFG_State fgState;
} }
/* /*
* Following definitions are somewhat similiar to GLib's, * Following definitions are somewhat similar to GLib's,
* but do not generate any log messages: * but do not generate any log messages:
*/ */
#define freeglut_return_if_fail( expr ) \ #define freeglut_return_if_fail( expr ) \
@ -1008,7 +1008,7 @@ void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback,
SFG_Window* fgWindowByHandle( SFG_WindowHandleType hWindow ); SFG_Window* fgWindowByHandle( SFG_WindowHandleType hWindow );
/* /*
* This function is similiar to the previous one, except it is * This function is similar to the previous one, except it is
* looking for a specified (sub)window identifier. The function * looking for a specified (sub)window identifier. The function
* is defined in fg_structure.c file. * is defined in fg_structure.c file.
*/ */

2
freeglut/freeglut/src/fg_menu.c
View File

@ -65,7 +65,7 @@
* These variables are for rendering the freeglut menu items. * These variables are for rendering the freeglut menu items.
* *
* The choices are fore- and background, with and without h for Highlighting. * The choices are fore- and background, with and without h for Highlighting.
* Old GLUT appeared to be system-dependant for its colors (sigh) so we are * Old GLUT appeared to be system-dependent for its colors (sigh) so we are
* too. These variables should be stuffed into global state and initialized * too. These variables should be stuffed into global state and initialized
* via the glutInit*() system. * via the glutInit*() system.
*/ */

4
freeglut/freeglut/src/fg_structure.c
View File

@ -100,7 +100,7 @@ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title,
/* /*
* Open the window now. The fgOpenWindow() function is system * Open the window now. The fgOpenWindow() function is system
* dependant, and resides in fg_window.c. Uses fgState. * dependent, and resides in fg_window.c. Uses fgState.
*/ */
fgOpenWindow( window, title, positionUse, x, y, sizeUse, w, h, gameMode, fgOpenWindow( window, title, positionUse, x, y, sizeUse, w, h, gameMode,
(GLboolean)(parent ? GL_TRUE : GL_FALSE) ); (GLboolean)(parent ? GL_TRUE : GL_FALSE) );
@ -332,7 +332,7 @@ void fgDestroyMenu( SFG_Menu* menu )
* This function should be called on glutInit(). It will prepare the internal * This function should be called on glutInit(). It will prepare the internal
* structure of freeglut to be used in the application. The structure will be * structure of freeglut to be used in the application. The structure will be
* destroyed using fgDestroyStructure() on glutMainLoop() return. In that * destroyed using fgDestroyStructure() on glutMainLoop() return. In that
* case further use of freeglut should be preceeded with a glutInit() call. * case further use of freeglut should be preceded with a glutInit() call.
*/ */
void fgCreateStructure( void ) void fgCreateStructure( void )
{ {

2
freeglut/freeglut/src/fg_teapot_data.h
View File

@ -59,7 +59,7 @@
Following this, there is a numbered list of vertices. Following the Following this, there is a numbered list of vertices. Following the
vertices are, one per line, a list of indices of vertices, describing vertices are, one per line, a list of indices of vertices, describing
each patch. The first index in each patch is preceeded by the character each patch. The first index in each patch is preceded by the character
"-" to delimit patch index lists. The patches are all bicubic Bezier "-" to delimit patch index lists. The patches are all bicubic Bezier
patches, so there are 16 vertices in each patch, and thus the vertex lists patches, so there are 16 vertices in each patch, and thus the vertex lists
are each 16 entries long. This is analogous to an "indexed polygon", if you are each 16 entries long. This is analogous to an "indexed polygon", if you

4
freeglut/freeglut/src/x11/fg_gamemode_x11.c
View File

@ -75,7 +75,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
XRRScreenConfiguration *xrr_config = 0; XRRScreenConfiguration *xrr_config = 0;
Status result = -1; Status result = -1;
/* NOTE: we have already determined that XR&R is availble and enabled before calling this */ /* NOTE: we have already determined that XR&R is available and enabled before calling this */
XRRQueryVersion(fgDisplay.pDisplay.Display, &ver_major, &ver_minor); XRRQueryVersion(fgDisplay.pDisplay.Display, &ver_major, &ver_minor);
@ -572,7 +572,7 @@ void fgPlatformEnterGameMode( void )
* more changes and investigation. * more changes and investigation.
*/ */
/* Get the current postion of the drawable area on screen */ /* Get the current position of the drawable area on screen */
XTranslateCoordinates( XTranslateCoordinates(
fgDisplay.pDisplay.Display, fgDisplay.pDisplay.Display,
fgStructure.CurrentWindow->Window.Handle, fgStructure.CurrentWindow->Window.Handle,

2
freeglut/freeglut/src/x11/fg_glutfont_definitions_x11.c
View File

@ -44,7 +44,7 @@
* freeglut_internal.h uses some GL types, but including the GL header portably * freeglut_internal.h uses some GL types, but including the GL header portably
* is a bit tricky, so we include freeglut_std.h here, which contains the * is a bit tricky, so we include freeglut_std.h here, which contains the
* necessary machinery. But this poses another problem, caused by the ugly * necessary machinery. But this poses another problem, caused by the ugly
* original defintion of the font constants in "classic" GLUT: They are defined * original definition of the font constants in "classic" GLUT: They are defined
* as void* externally, so we move them temporarily out of the way by AN EXTREME * as void* externally, so we move them temporarily out of the way by AN EXTREME
* CPP HACK. * CPP HACK.
*/ */

2
freeglut/freeglut/src/x11/fg_state_x11.c
View File

@ -79,7 +79,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
{ {
/* /*
* Those calls are somewhat similiar, as they use XGetWindowAttributes() * Those calls are somewhat similar, as they use XGetWindowAttributes()
* function * function
*/ */
case GLUT_WINDOW_X: case GLUT_WINDOW_X:

2
freeglut/freeglut/src/x11/fg_state_x11_glx.c
View File

@ -94,7 +94,7 @@ int fghPlatformGlutGetGLX ( GLenum eWhat )
return fghChooseConfig(&config); return fghChooseConfig(&config);
} }
/* This is system-dependant */ /* This is system-dependent */
case GLUT_WINDOW_FORMAT_ID: case GLUT_WINDOW_FORMAT_ID:
if( fgStructure.CurrentWindow == NULL ) if( fgStructure.CurrentWindow == NULL )
return 0; return 0;

2
freeglut/web-src/docs/gles.php
View File

@ -93,7 +93,7 @@ PKG_CONFIG_PATH=/tmp/freeglut-native-gles/share/pkgconfig/ cmake ..
<ul> <ul>
<li>OpenGL Wikibook's <li>OpenGL Wikibook's
<a href="https://gitorious.org/wikibooks-opengl/modern-tutorials/source/HEAD:tut04_transform-gles2"><tt>tut04_transform-gles2</tt> <a href="https://gitorious.org/wikibooks-opengl/modern-tutorials/source/HEAD:tut04_transform-gles2"><tt>tut04_transform-gles2</tt>
example</a>: it uses a basic Makefile targetting <tt>freeglut-gles</tt></li> example</a>: it uses a basic Makefile targeting <tt>freeglut-gles</tt></li>
<li><tt>progs/test-shapes-gles1/</tt> in the source distribution: <li><tt>progs/test-shapes-gles1/</tt> in the source distribution:
it is a standalone CMake app that uses FreeGLUT GLES (v1).</li> it is a standalone CMake app that uses FreeGLUT GLES (v1).</li>
</ul> </ul>

2
freeglut/web-src/index.php
View File

@ -37,7 +37,7 @@ for developers to help out with further work on the Android and BlackBerry 10
ports. Furthermore, ports to Cocoa/Carbon on OSX, and maybe even Wayland ports. Furthermore, ports to Cocoa/Carbon on OSX, and maybe even Wayland
are planned, along with some enhancements to the API and implementation. are planned, along with some enhancements to the API and implementation.
See <a href="progress.php">here</a> for an overview of the major points See <a href="progress.php">here</a> for an overview of the major points
on our todo list. You can easily help out by forking the unoffical clone on our todo list. You can easily help out by forking the unofficial clone
of our <a of our <a
href="https://sourceforge.net/p/freeglut/code/HEAD/tree/">sourceforge.net href="https://sourceforge.net/p/freeglut/code/HEAD/tree/">sourceforge.net
SVN repository</a> on <a SVN repository</a> on <a