Per Inge Mathisen
a71086a039
Prune dead code, and do not bother to dynamically allocate memory to save 12 bytes per polygon.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4037 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:46:29 +00:00
Per Inge Mathisen
d5687a6bce
Only set the colour for a model once, not once for every vertex. It does not vary.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4036 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:10:57 +00:00
Per Inge Mathisen
7693909947
Kill oddball type TERRAIN_VERTEXF (never used for terrain!) and reduce copying some more.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4035 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:03:50 +00:00
Per Inge Mathisen
3bcd4f7d1d
Kill PIEPOLY and reduce a lot of silly copying of variables back and forth for each polygon.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4033 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:44:57 +00:00
Per Inge Mathisen
a8f88483ac
Fix bug in OpenGL lighting mode which would mess up GUI. Also do not
...
recalculate the surface normal for every polygon for every frame! It
is already calculated when we load the PIE model, so let's use it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4032 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:09:44 +00:00
Per Inge Mathisen
5f31a354f3
Do not enable and disable GL_LIGHTING for every polygon when lighting mode is enabled.
...
Reorganize the drawing code a bit to make it more obvious how the calls go.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4031 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:52:09 +00:00
Per Inge Mathisen
4b7f572ba4
Simplify pie_Polygon() since we never draw polygons of less than 3 vertices.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4030 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:32:45 +00:00
Per Inge Mathisen
f9d2a9152d
Remove PIE_ALPHA. Revert most of r4023, since some parts of the drawing code
...
did not handle alpha blending too well, and blended solids in some cases.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4025 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 21:07:26 +00:00
Per Inge Mathisen
169e5bcc42
Drastically reduce the number of (spurious) state changes per frame.
...
Doubles frames per second drawn here.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4024 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 20:14:25 +00:00
Per Inge Mathisen
d4e10b07e9
Do not care what blending state we are in when drawing simple and solid
...
graphics additions like lines and boxes to cut down on state changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4023 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:56:34 +00:00
Per Inge Mathisen
4004ce9872
Clean up in rendering modes. Remove unuseful pie_SetColourCombine().
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4022 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:41:33 +00:00
Per Inge Mathisen
83ddfb7b99
Small cleanup of the screen flip code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4021 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:29:24 +00:00
Dennis Schridde
303895e5fb
Mark all BASE_OBJECT "derived" types as WZ_DECL_MAY_ALIAS (they may alias with any type).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4011 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 15:53:45 +00:00
Giel van Schijndel
08e68d9c54
Don't initalise the 'file' pointer with itself
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4004 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:06:00 +00:00
Giel van Schijndel
dd0655b915
Make sure that xFullPathname uses SQLITE_OK as its return value for success (and SQLITE_IOERR for failure)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4003 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:05:38 +00:00
Giel van Schijndel
c4a62d5139
Rename sqlite3.diff to sqlite3.5.4.diff and update it to be a diff against r3997
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3999 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 17:00:31 +00:00
Giel van Schijndel
fa47b4ff72
Revert r3997 (we now have the original 3.5.4 in SVN history, at r3997)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3998 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:57:11 +00:00
Giel van Schijndel
9e7ba7bc22
Oops, r3994 still had some of our changes in it (r3992 to be precise), so this __is__ the clean 3.5.4 version
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3997 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:55:01 +00:00
Dennis Schridde
65dd2bce19
Update the diff to r3995 to log the base revision inside the file (svn diff -r3994 sqlite3.c > sqlite3.diff)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3996 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 14:46:46 +00:00
Giel van Schijndel
4e9e8e60d6
Revert r3994 (we now have the original 3.5.4 in SVN history, at r3994)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3995 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:52:21 +00:00
Giel van Schijndel
64dd1a52c5
Revert to SQLite before all modifications (i.e. this is the amalgamation of 3.5.4)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3994 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:49:58 +00:00
Dennis Schridde
f0ab52dbd3
Fix some missing initialisers
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3992 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:42:18 +00:00
Dennis Schridde
d7bb157c7b
Strip -Werror from WZ_CFLAGS for sqlite3, since there are far more warnings...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3991 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:10:35 +00:00
Giel van Schijndel
33216b2e9d
Move all stuff that actually belongs in CPPFLAGS (but is called CFLAGS) to AM_CPPFLAGS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3988 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:50:58 +00:00
Giel van Schijndel
037471b784
Update sqlite3.diff for r3984
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3987 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:15:45 +00:00
Dennis Schridde
d8409c9819
- Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines
...
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 02:01:46 +00:00
Dennis Schridde
67247633e5
mutexIsNT() is never used -> warning -> error -> I remove it
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3984 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 00:59:29 +00:00
Dennis Schridde
9f44219b1c
Move addition of CFLAGS from configure.ac to the places they are actually needed.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3983 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 20:08:42 +00:00
Giel van Schijndel
0af1927488
Provide two functions (sqlite3_register_physfs_vfs and sqlite3_unregister_physfs_vfs) for registering and unregistering of the PhysicsFS implementation for SQLite's VFS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3982 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 17:04:42 +00:00
Giel van Schijndel
5bf53cd315
Relicense the PhysicsFS implementation of SQLite's (3.5+) VFS to the zlib license to be fully compatible with PhysicsFS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3981 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 17:04:35 +00:00
Giel van Schijndel
93f7fc095a
Update the sqlite3.diff for r3971
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3972 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 11:50:43 +00:00
Dennis Schridde
3f67498774
Prevent problem with the definition of DATADIR (wz' configure defines it to a string, what objidl.h does not like, because it uses that name as an identifier).
...
This also should cut down compilation a bit...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3971 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 11:42:53 +00:00
Per Inge Mathisen
916435094f
Add message to MSVC users about disabled warnings. Patch #995 from Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3967 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 10:06:05 +00:00
Giel van Schijndel
b467d49a2e
Fix the MSVC project file for sqlite3; patch by Buginator
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3958 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 18:24:20 +00:00
Giel van Schijndel
84b03f9468
Allow compiling of sqlite3.c by disabling -Wmissing-field-initializers when compiling in lib/sqlite3/
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3954 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 15:26:48 +00:00
Giel van Schijndel
9b71eb9821
Add a partially completed SQLite VFS (requires SQLite 3.5+) implementation for PhysicsFS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3951 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 14:23:07 +00:00
Dennis Schridde
3858daf4a1
Reset MSVC version from 9 to 8, since otherwise MSVC8 will refuse to load the project files. (bug #11219 )
...
Does MS provide some kind of templating system? Like autotools generate Makefiles from Makefile.am.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3950 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 11:28:40 +00:00
Dennis Schridde
d3455b699a
Properly set include/library directories for MSVC
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3949 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 01:45:45 +00:00
Dennis Schridde
056147b16d
Oh my beauty...
...
Please don't clutter the detection code with platform specific fixes... That's what the /* ---- Platform specific setup ---- */ section is for...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3948 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 21:51:53 +00:00
Per Inge Mathisen
dfad738d65
Fix most MSVC warnings.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3947 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 19:26:19 +00:00
Dennis Schridde
0c79f4b551
Simplify roundf() guards
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3946 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:45:56 +00:00
Per Inge Mathisen
d8787a14e9
Allow for non-GNU C99 compilers
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3945 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:37:59 +00:00
Per Inge Mathisen
51ca960ed5
Add -Wmissing-field-initializers, fix missing field initializers, and make source
...
compile even if GCC is not C99 compatible.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3944 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:27:43 +00:00
Dennis Schridde
1c52c14833
Whitespaces
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3940 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 15:15:27 +00:00
Dennis Schridde
a8dc02f672
Generic cleanup, often variable initialisation
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3939 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 15:09:03 +00:00
Dennis Schridde
da462b4511
More float specialisation and generic cleanup
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3937 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 12:42:42 +00:00
Dennis Schridde
8fc819377a
Move generic math functions from trig.h to math-help.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3935 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 12:17:11 +00:00
Dennis Schridde
a3284e7a7d
Port r3921 till r3924:
...
- Move VISIBLE_XTILES from src/ to lib/ivis_common/, so we don't have to hardcore mapview sizes in piedraw.c...
- Make INTERFACE_DEPTH/MAX_Z int, since that's what they are used as.
- Remove unused defines
- Less fog and more shadows
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3926 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 19:30:29 +00:00
Dennis Schridde
73581e05b3
Apply patch #991
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3918 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 18:05:57 +00:00
Dennis Schridde
a854a84ae1
Port r3912: Replace GLC_ with _glc to prevent confusion and use GLC_UTF8_QSO as string type.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3914 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-04 15:03:18 +00:00