Diederick Niehorster [Sat, 17 Mar 2012 16:11:06 +0000 (16:11 +0000)]
got rid of edgeflags as I now draw all wire frames face-by-face using
line loops. Split wire and solid drawing in two separate functions
Now doing polygon to triangle decomposition using vertex indices that
are passed to glDrawElements, saves on memory, executes more efficient,
and makes wireframe drawing a piece of cake.
This should be GLES1 compatible too, hope so!
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1184
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 15:36:25 +0000 (15:36 +0000)]
Implement EGL fgPlatformGlutGetModeValues and partial/reusable fgPlatformGlutGet
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1183
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 14:24:42 +0000 (14:24 +0000)]
EGL: implement fgPlatformSetWindow
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1182
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 14:18:33 +0000 (14:18 +0000)]
Add 2 more temporary stubs
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1181
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 14:14:01 +0000 (14:14 +0000)]
Remove Android-specific code (logging) in fg_display_egl
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1180
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 13:29:51 +0000 (13:29 +0000)]
Context can be used for a menu rather than the current window
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1179
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 12:34:22 +0000 (12:34 +0000)]
EGL: more code reusability
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1178
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 11:39:45 +0000 (11:39 +0000)]
fghChooseConfigEGL returns 1/0 if found/not found
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1177
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 11:21:56 +0000 (11:21 +0000)]
Move tagSFG_PlatformWindowState from EGL to Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1176
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 10:33:28 +0000 (10:33 +0000)]
Move OpenGL ES stubs out of Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1175
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 10:30:31 +0000 (10:30 +0000)]
EGL: make more code reusable - less Android-specific
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1174
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 10:09:19 +0000 (10:09 +0000)]
EGL: separate config and context code
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1173
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sat, 17 Mar 2012 07:05:25 +0000 (07:05 +0000)]
Copy documentation about FREEGLUT_GLES2 and FREEGLUT_GLES1 from CMakefile.txt to freeglut_std.h (a.k.a. don't use them)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1172
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 04:00:13 +0000 (04:00 +0000)]
that definition is FREEGLUT_GLES1, not FREEGLUT_GLES
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1171
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 03:58:26 +0000 (03:58 +0000)]
little bit of cleanup
added code for GLES1 (though only tested on OpenGL 2, non-ES context)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1170
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 02:23:03 +0000 (02:23 +0000)]
oops, that was a bit sloppy. Also added a missing free
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1169
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 02:21:19 +0000 (02:21 +0000)]
check for every malloc call if memory was allocated successfully
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1168
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 02:11:49 +0000 (02:11 +0000)]
Need to also set glDisable(GL_CULL_FACE) when drawing wireframe to match what was
produced before
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1167
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 02:06:21 +0000 (02:06 +0000)]
Done dodecahedron. Nice, this just worked!
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1166
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 01:36:08 +0000 (01:36 +0000)]
removing some debug code
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1165
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 01:35:11 +0000 (01:35 +0000)]
was still trying to draw RhombicDodecahedron as GL_QUAD, of course it
doesn't work
Made internal draw macro for case with edge flags
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1164
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 00:32:08 +0000 (00:32 +0000)]
implemented scheme for automatic square and pentagon decomposition and
edgeflag generation
Works for cube, RhombicDodecahedron temporarily broken (probably due to
incorrect vertex order for decomposition method)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1163
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 17 Mar 2012 00:21:40 +0000 (00:21 +0000)]
corrected data type (its a demo after all, better be precise)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1162
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 16 Mar 2012 23:23:19 +0000 (23:23 +0000)]
Move EGL fields to a separate structure for reusability (e.g. upcoming Mesa X11 EGL support)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1161
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 16 Mar 2012 21:39:37 +0000 (21:39 +0000)]
CMake: Declare OPTIONS higher in the file so they can be used to conditionaly include source files
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1160
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 16 Mar 2012 21:30:26 +0000 (21:30 +0000)]
GLES1 and GLES2 versions are now compiled with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly bootstrap headers inclusion
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1159
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 16 Mar 2012 20:43:29 +0000 (20:43 +0000)]
CMake: use same test for referencing and generating freeglutdll.def
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1158
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 11:06:23 +0000 (11:06 +0000)]
cube now done with triangles, internal edges on each face hidden with
edge flag
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1157
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 08:46:13 +0000 (08:46 +0000)]
RhombicDodecahedron moved to glVertexPointer
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1156
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 08:36:48 +0000 (08:36 +0000)]
icosahedron also done
wrote for easy declaring of interface functions
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1155
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 07:55:12 +0000 (07:55 +0000)]
made some macros to reduce code duplication
made naming completely consistent now
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1154
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 07:24:34 +0000 (07:24 +0000)]
octahedron also done
another pass at making all variable types consistent
added some direct mode drawing code for debugging
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1153
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 06:05:33 +0000 (06:05 +0000)]
now a toggle for perspective/orthogonal projection in shapes demo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1152
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 05:08:39 +0000 (05:08 +0000)]
outer radius parameter in shapes demo now doubles as size for all the
other objects that support a size (luckily many don't, just glScale!)
moved text a bit more to corner of screen so its more out of the way
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1151
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 05:06:31 +0000 (05:06 +0000)]
dSize parameter of Cube now works correctly again
Fixed some inconsistent Macro naming and variable types
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1150
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 04:49:17 +0000 (04:49 +0000)]
now using one function to generate geometry from the lists of vertices,
normals and vertex indices
Geometry lists now stored in 1D arrays
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1149
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 04:23:48 +0000 (04:23 +0000)]
got one fo the cube's normals wrong
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1148
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 04:22:34 +0000 (04:22 +0000)]
array size second dim is simply 3...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1147
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 03:17:37 +0000 (03:17 +0000)]
I have these nice variables indicating whether the geometry cache for a
certain object was already filled, but i never set them to true...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1146
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 03:14:23 +0000 (03:14 +0000)]
Cube also moved to glDrawElements
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1145
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 02:01:59 +0000 (02:01 +0000)]
also did Sierpinski sponge
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1144
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 16 Mar 2012 00:40:15 +0000 (00:40 +0000)]
initial start at rewrite of fg_geometry functions, using glDrawArrays.
Tetrahedon done as example (seems to work well, but further comments
pending)
Done restructuring of the file as well
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1143
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 15 Mar 2012 20:51:24 +0000 (20:51 +0000)]
Add pkg-config script (cmake changes added by mistake in previous commit)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1142
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 15 Mar 2012 20:48:32 +0000 (20:48 +0000)]
CMake: Move -DANDROID in the toolchain script, to ease reuse of this file
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1141
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 15 Mar 2012 20:37:41 +0000 (20:37 +0000)]
A few fixes in cygwin docs
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1140
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Thu, 15 Mar 2012 19:52:16 +0000 (19:52 +0000)]
Error handling for eglSwapBuffers
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1139
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 15 Mar 2012 03:07:57 +0000 (03:07 +0000)]
no need for a message on MSVC that we hide insecure CRT warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1138
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 15 Mar 2012 03:06:42 +0000 (03:06 +0000)]
oops, generating freeglutdll.def was not specific to MSVC
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1137
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 15 Mar 2012 02:34:33 +0000 (02:34 +0000)]
converted all tabs to spaces for CMake file, eases editing and indenting
in diffs looks right
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1136
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 15 Mar 2012 02:30:50 +0000 (02:30 +0000)]
FreeGLUT version number is now only defined in CMake file. All other
files containing a version number are now automatically generated upon
configure
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1135
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 15 Mar 2012 02:24:06 +0000 (02:24 +0000)]
and again some more documentation of what kind of version is referred to
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1134
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 15 Mar 2012 02:15:54 +0000 (02:15 +0000)]
added a bit more doc
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1133
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 15 Mar 2012 01:50:44 +0000 (01:50 +0000)]
just a typo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1132
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 14 Mar 2012 14:57:05 +0000 (14:57 +0000)]
removed the obsolete GPL copyright statement templates
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1131
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 14 Mar 2012 03:50:59 +0000 (03:50 +0000)]
removed parts from readme that are definately outdated. The rest is
useful and will need to be massaged into a helpful text before 3.0
release
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1130
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 14 Mar 2012 03:38:47 +0000 (03:38 +0000)]
also added build64 to list of ignores
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1129
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 13 Mar 2012 19:36:28 +0000 (19:36 +0000)]
- forgot to remove autogen.sh previously along with the rest of the autotools
stuff
- removed other random build files that have accumulated over time. Kdevelop
project files, microsoft nmake files, etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1128
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 13 Mar 2012 19:24:01 +0000 (19:24 +0000)]
Removed autotools build files (I think I got all of them, did I?)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1127
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 13 Mar 2012 19:05:32 +0000 (19:05 +0000)]
Added a few more details to README.cmake
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1126
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Tue, 13 Mar 2012 11:13:06 +0000 (11:13 +0000)]
removed VC6 files
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1125
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Tue, 13 Mar 2012 11:08:26 +0000 (11:08 +0000)]
Removed VS2008 and VS2010 files
set ignore for my /build directory, removed ignore for config.h.in
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1124
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Tue, 13 Mar 2012 11:03:23 +0000 (11:03 +0000)]
found both SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
and SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) were used,
removed the second (deprecated) commands
This results in shared libraries being build in /bin on windows, but not
other platforms, obviating the need to copy dlls to /bin. Documented
this
the copy of fractals.dat should now work on all platforms (hopefully)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1123
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Tue, 13 Mar 2012 08:24:20 +0000 (08:24 +0000)]
added a quick tut for using cmake, adapted from mash-project.eu/wiki/index.php/CMake:_Quick_Start_Guide
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1122
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 12 Mar 2012 16:33:46 +0000 (16:33 +0000)]
moved glutTimerFunc in timer demo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1121
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 12 Mar 2012 15:41:39 +0000 (15:41 +0000)]
added to CMake a setup to copy shared lib (MSVC only right now) and
fractals.dat to demo binary folder if demos are built
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1120
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 12 Mar 2012 07:26:37 +0000 (07:26 +0000)]
cleaneup \machine setting for MSVC, now only for 64bit static libs, only
onwe for which needed. Added a comment showing why its needed
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1119
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 12 Mar 2012 05:07:35 +0000 (05:07 +0000)]
.def and .rc file were appended to source list AFTER target was defined,
so moved them up in the file
now setting target machine for linker, or we get in trouble at least
with static libs on x64
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1118
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 12 Mar 2012 04:24:40 +0000 (04:24 +0000)]
now only setting FREEGLUT_EXPORTS and FREEGLUT_STATIC for the shared and
static dll/lib respectively, instead of globally defining those for all
targets
That revealed the static build of the demos is broken, needed to add the
FREEGLUT_STATIC definition there too
Not including .def file on windows if 64 bit build.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1117
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 12 Mar 2012 03:32:53 +0000 (03:32 +0000)]
now use unsigned __int64 for time type when on MSVC, that is supported
down to at least MSVC6 (thanks Sisyphus!)
Also, type present checks are not done if stdint or inttypes headers are
found, no need for them then.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1116
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 11 Mar 2012 23:35:11 +0000 (23:35 +0000)]
HAVE_ULONG_LONG now only defined when unsigned long long is available
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1115
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 16:01:29 +0000 (16:01 +0000)]
Rename Android and EGL files
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1114
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 11 Mar 2012 15:26:01 +0000 (15:26 +0000)]
Need for our XParseGeometry implementation now detected by CMake
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1113
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 11 Mar 2012 15:14:33 +0000 (15:14 +0000)]
and some more renames
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1112
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 11 Mar 2012 14:59:56 +0000 (14:59 +0000)]
moved common files back to src root
renamed (a bunch of) the freeglut_ prefixes to fg_
did the necessary edits of the source files (I hope)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1111
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 11 Mar 2012 13:03:14 +0000 (13:03 +0000)]
timers internally now use 64bit unsigned int, if available
External timer info (glutGet) unchanged.
Some work to do to improve Windows timers beyond what it is now...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1110
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:53:22 +0000 (09:53 +0000)]
CMake: add precision about version-info / soname
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1109
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:45:20 +0000 (09:45 +0000)]
Add development progress status for Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1108
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:35:29 +0000 (09:35 +0000)]
Add .gitignore file to work with git-svn
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1107
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:34:30 +0000 (09:34 +0000)]
autotools: Android port
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1106
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:31:44 +0000 (09:31 +0000)]
CMake: Android port
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1105
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:30:51 +0000 (09:30 +0000)]
Support GLES headers
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1104
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:18:53 +0000 (09:18 +0000)]
Android documentation
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1103
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 09:18:15 +0000 (09:18 +0000)]
CMake: option to build with OpenGL ES
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1102
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 11 Mar 2012 08:55:24 +0000 (08:55 +0000)]
Add base Android and EGL code
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1101
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Sat, 10 Mar 2012 14:55:50 +0000 (14:55 +0000)]
added the timer demo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1100
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 10 Mar 2012 12:53:50 +0000 (12:53 +0000)]
added not about soversion for those not knowledgable (like me). Thanks
Sylvain!
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1099
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 10 Mar 2012 11:08:44 +0000 (11:08 +0000)]
CMake updates:
- no longer trying to link with m.lib (tht maths for linux)
- now building demos for static and for shared library, depending on
which libraries are created
- TARGET_LINK_LIBRARIES statement conditional on whether the relevant
shared/static library is built
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1098
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 10 Mar 2012 03:17:55 +0000 (03:17 +0000)]
in freeglut_init set gamemode defaults to -1 (no change from current
display mode) so that it is not attempted to change the display mode
to some arbitrary default when entering gamemode (only applies if
glutGameModeString is never called)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1097
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 10 Mar 2012 03:07:13 +0000 (03:07 +0000)]
moved some windows only code from common to windows specific
got rid of fgPlatformGlutLayerGet as we'll never implement layer support
(added some notes too)
added note about implementability of glutGetModeValues
Moved joystick function from misc to Joystick code file
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1096
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 10 Mar 2012 02:03:32 +0000 (02:03 +0000)]
XParseGeometry include now compiles with windows (VS2010, didn't touch
cmake)
Various typos in comments
Some other cleanup and formatting
glutInitDisplayString now understands "borderless"
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1095
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 21:02:20 +0000 (21:02 +0000)]
Include xparsegeometry_repl.h header on non-X11 targets
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1094
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:54:03 +0000 (20:54 +0000)]
Make XParseGeometry reusable by several ports (3)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1093
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:48:03 +0000 (20:48 +0000)]
Make XParseGeometry reusable by several ports (2)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1092
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:46:15 +0000 (20:46 +0000)]
Make XParseGeometry reusable by several ports
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1091
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:34:51 +0000 (20:34 +0000)]
Add CMake toolchain script for mingw32/64 compilation, and update documentation
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1090
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:33:54 +0000 (20:33 +0000)]
Specify libraries for windows static compilation
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1089
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:29:58 +0000 (20:29 +0000)]
CMake now defines HAVE_VFPRINTF for windows; suppress redefinition warning
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1088
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:20:20 +0000 (20:20 +0000)]
Detect vfprintf (used in fgError/fgWarning)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1087
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 20:02:30 +0000 (20:02 +0000)]
Fix .so dependencies: reference -lGL and -lm; only reference -lGLU for demos (Resizer)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1086
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Fri, 9 Mar 2012 19:49:49 +0000 (19:49 +0000)]
Properly add maths library for demos
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1085
7f0cb862-5218-0410-a997-
914c9d46530a