Commit Graph

1527 Commits

Author SHA1 Message Date
dcnieho
ade8e6e8ef icosahedron also done
wrote for easy declaring of interface functions


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1155 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 08:36:48 +00:00
dcnieho
b6f616f685 made some macros to reduce code duplication
made naming completely consistent now


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1154 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 07:55:12 +00:00
dcnieho
4f9c00faa7 octahedron also done
another pass at making all variable types consistent
added some direct mode drawing code for debugging


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1153 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 07:24:34 +00:00
dcnieho
5bb67c1c82 now a toggle for perspective/orthogonal projection in shapes demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1152 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 06:05:33 +00:00
dcnieho
f692084300 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: https://svn.code.sf.net/p/freeglut/code/trunk@1151 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 05:08:39 +00:00
dcnieho
92b1d69dd4 dSize parameter of Cube now works correctly again
Fixed some inconsistent Macro naming and variable types


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1150 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 05:06:31 +00:00
dcnieho
0eb4534962 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: https://svn.code.sf.net/p/freeglut/code/trunk@1149 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 04:49:17 +00:00
dcnieho
fe5c7db449 got one fo the cube's normals wrong
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1148 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 04:23:48 +00:00
dcnieho
eb95f57fa6 array size second dim is simply 3...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1147 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 04:22:34 +00:00
dcnieho
40e7dfa35c 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: https://svn.code.sf.net/p/freeglut/code/trunk@1146 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 03:17:37 +00:00
dcnieho
833166240f Cube also moved to glDrawElements
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1145 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 03:14:23 +00:00
dcnieho
d3550b00d9 also did Sierpinski sponge
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1144 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 02:01:59 +00:00
dcnieho
19a3927adc 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: https://svn.code.sf.net/p/freeglut/code/trunk@1143 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-16 00:40:15 +00:00
beuc
bae0c12952 Add pkg-config script (cmake changes added by mistake in previous commit)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1142 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 20:51:24 +00:00
beuc
02880439ed CMake: Move -DANDROID in the toolchain script, to ease reuse of this file
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1141 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 20:48:32 +00:00
beuc
41c6d2ada6 A few fixes in cygwin docs
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1140 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 20:37:41 +00:00
beuc
e74cb052f0 Error handling for eglSwapBuffers
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1139 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 19:52:16 +00:00
dcnieho
792977034a no need for a message on MSVC that we hide insecure CRT warnings
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1138 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 03:07:57 +00:00
dcnieho
cb228b70f0 oops, generating freeglutdll.def was not specific to MSVC
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1137 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 03:06:42 +00:00
dcnieho
0cfd678fda converted all tabs to spaces for CMake file, eases editing and indenting
in diffs looks right


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1136 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 02:34:33 +00:00
dcnieho
7bd8533032 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: https://svn.code.sf.net/p/freeglut/code/trunk@1135 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 02:30:50 +00:00
dcnieho
005fa934ae and again some more documentation of what kind of version is referred to
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1134 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 02:24:06 +00:00
dcnieho
4d7086a873 added a bit more doc
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1133 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 02:15:54 +00:00
dcnieho
394f2c0538 just a typo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1132 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-15 01:50:44 +00:00
jtsiomb
39b2e08b7f removed the obsolete GPL copyright statement templates
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1131 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-14 14:57:05 +00:00
dcnieho
b83545263c 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: https://svn.code.sf.net/p/freeglut/code/trunk@1130 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-14 03:50:59 +00:00
dcnieho
67c4e24bc1 also added build64 to list of ignores
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1129 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-14 03:38:47 +00:00
jtsiomb
e5c97b977a - 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: https://svn.code.sf.net/p/freeglut/code/trunk@1128 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 19:36:28 +00:00
jtsiomb
03dc75a452 Removed autotools build files (I think I got all of them, did I?)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1127 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 19:24:01 +00:00
jtsiomb
15e9bb8752 Added a few more details to README.cmake
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1126 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 19:05:32 +00:00
dcnieho
01f323da92 removed VC6 files
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1125 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 11:13:06 +00:00
dcnieho
64fb938163 Removed VS2008 and VS2010 files
set ignore for my /build directory, removed ignore for config.h.in


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1124 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 11:08:26 +00:00
dcnieho
ed02f5da91 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: https://svn.code.sf.net/p/freeglut/code/trunk@1123 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 11:03:23 +00:00
dcnieho
41283a36c5 added a quick tut for using cmake, adapted from http://mash-project.eu/wiki/index.php/CMake:_Quick_Start_Guide
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1122 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-13 08:24:20 +00:00
dcnieho
b6e8aa6776 moved glutTimerFunc in timer demo
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1121 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 16:33:46 +00:00
dcnieho
19095d15bf 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: https://svn.code.sf.net/p/freeglut/code/trunk@1120 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 15:41:39 +00:00
dcnieho
b16eb164ca 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: https://svn.code.sf.net/p/freeglut/code/trunk@1119 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 07:26:37 +00:00
dcnieho
b2159329f2 .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: https://svn.code.sf.net/p/freeglut/code/trunk@1118 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 05:07:35 +00:00
dcnieho
d3496a2968 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: https://svn.code.sf.net/p/freeglut/code/trunk@1117 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 04:24:40 +00:00
dcnieho
fe9b63c890 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: https://svn.code.sf.net/p/freeglut/code/trunk@1116 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-12 03:32:53 +00:00
dcnieho
83672b987c HAVE_ULONG_LONG now only defined when unsigned long long is available
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1115 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 23:35:11 +00:00
beuc
2930d1d941 Rename Android and EGL files
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1114 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 16:01:29 +00:00
dcnieho
2549248d0c Need for our XParseGeometry implementation now detected by CMake
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1113 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 15:26:01 +00:00
dcnieho
b66e4bfa9d and some more renames
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1112 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 15:14:33 +00:00
dcnieho
ed993a1882 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: https://svn.code.sf.net/p/freeglut/code/trunk@1111 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 14:59:56 +00:00
dcnieho
e78202b0af 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: https://svn.code.sf.net/p/freeglut/code/trunk@1110 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 13:03:14 +00:00
beuc
49bfb6bd84 CMake: add precision about version-info / soname
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1109 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:53:22 +00:00
beuc
5280ea4f52 Add development progress status for Android
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1108 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:45:20 +00:00
beuc
581d0b266e Add .gitignore file to work with git-svn
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1107 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:35:29 +00:00
beuc
8b09e1ff0d autotools: Android port
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1106 7f0cb862-5218-0410-a997-914c9d46530a
2012-03-11 09:34:30 +00:00