Commit Graph

361 Commits (359efe39ac0c4b46b6738eacc41f1de42b049489)

Author SHA1 Message Date
Per Inge Mathisen eaa506a47f Do not re-enable texturing if it is already enabled.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4332 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-25 19:23:26 +00:00
Dennis Schridde 10f2ccfd56 TRUE->true, FALSE->false (except in scripts)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4311 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-24 16:51:17 +00:00
Roman C a1008c093d Reduce amount of junk in the MSVC compilation output by about 70%.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4279 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 22:15:28 +00:00
Roman C 399e92a1ed Make sure chat messages won't be overlooked during mp games by making chat messages stand out from system messages.
If enemy/foe radar colors are on (SHIFT+TAB) then all ally messages are yellow, enemy messages are red. If enemy/foe mode is off all chat messages are simply brighter than system messages.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4272 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 20:04:37 +00:00
Dennis Schridde b1b2859ea3 New enum TEXPAGE_TYPE, to better control disabling/enabling of texturing. (Changed pie_SetTexturePage accordingly.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4202 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:34:30 +00:00
Per Inge Mathisen fe2ff84ed3 Fix bug #11216: When a tooltip is shown, the sky vanishes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4164 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 14:59:33 +00:00
Dennis Schridde 0c5ecc0efb Fix bug #11277: Strings containing non-ascii characters missing
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4118 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-17 07:23:48 +00:00
Dennis Schridde 2537bfc61c Cleanup #includes a bit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4107 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:39:08 +00:00
Per Inge Mathisen 1b9ef4f995 Remove hardcoded map visibility size from the ivis_opengl code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4103 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 11:05:08 +00:00
Dennis Schridde 0316bee001 Remove original backdrops (ugly) and wzlogo 3, 4 and rename the others to backdropX
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4046 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 19:31:42 +00:00
Dennis Schridde cb2f0a30df Patch MSVC Solution file to depend on SQLite and change eol-style to native for them, since otherwise patches will not apply.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4044 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 18:16:04 +00:00
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
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
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 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
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 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 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 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
Dennis Schridde 377adc40d6 Another backdrop named "My Pet Turtle" by Cathuria from the "A paltry 30k polys" thread http://forums.wz2100.net/?topic=1361.0
License: CC BY-SA 3.0, as allways.
The border and logo look quite good ingame, so 07-bdrop.png should get that, too.
Also: Use a highres version of 07-bdrop.png, also by Cathuria
Also: Change COPYING.README style a bit


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3884 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 13:18:44 +00:00
Dennis Schridde 9b81337df9 Why did QuesoGLC/fontrendering only work on Mac OS X? Because the texture was set conditionaly for it only.
This applies patch #961 correctly and thus closes it.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3867 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-25 21:58:35 +00:00
Per Inge Mathisen 683d9deb2e Replace check_extension with one that does not anger valgrind.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3766 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-12 18:57:20 +00:00
Giel van Schijndel 722303eb84 Turn a lot of already-available function documentation comments into Doxygen documentation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3739 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:44:53 +00:00
Giel van Schijndel 72003cf9bf Provide Doxygen documentation for iV_DrawFormattedText() and change its return type to int
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3738 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:25:20 +00:00
Giel van Schijndel 24ba730bdb * in iV_DrawTextRotated() select the model view matrix and don't depend on that one being selected already
* Also push and pop the model view matrix


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3737 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:06:23 +00:00
Giel van Schijndel 637edb1f0d * in pie_SetTexturePage() _always_ disable texturing when invoked with a negative parameter
* In iV_DrawTextRotated() use -1 instead of -2 as texturepage (not that it matters anymore what negative number we use, due to the above change)
 * Add some Doxygen documentation to pie_SetTexturePage()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3736 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 15:03:58 +00:00
Ari Johnson adfeb3ab98 Updated Mac OS X port to use QuesoGLC 0.7.0 with a work-around for a
text display bug


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3732 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 21:55:02 +00:00
Per Inge Mathisen 54bcf0cde5 Remove completely mistaken comment from the original code. Textures use
0 to 256 range of texture coordinates, and the width of the texture should
therefore not be used to deduce wrap around point for texture animation.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3719 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 17:58:37 +00:00
Gerard Krol 5ee301ec76 Make the radar (minimap) transparent again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3701 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-05 23:02:59 +00:00
Gerard Krol 31a8a54ddb Revert r2901 as this is not the correct way to fix the smearing issues. It probably has something to do with the fogbox or
looking underground. As last resort r1301 "Speed up for people who are fillrate limited" can be reverted.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3699 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-05 21:35:42 +00:00
Per Inge Mathisen 79db811b58 Remove ugly radar constants from pieblitfunc, where they do not belong.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3691 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 18:03:02 +00:00
Per Inge Mathisen 20620668ef Move pie_DrawRect into narrower scope, move in some duplicated calling code, and make it static.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3689 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:58:18 +00:00
Per Inge Mathisen b1ef18e61d Kill unused PIESTYLE struct and parameter.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3688 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-04 16:55:56 +00:00
Dennis Schridde 411545852f Cleanup
- theSun becomes static (+setter/getter)
- normalsOnTile() doesn't use global vars anymore
- pie_SurfaceNormal3fv() now works more like the pievector.h functions
- pie_SurfaceNormal3fv() was cleaned up and became inline function in piematrix.h
- Use more pievector.h functions
- Remove unnecessary multiplications/divisions from calcTimeIllum()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3592 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 01:29:20 +00:00
Dennis Schridde 751d0809c5 Use new VectorX_Compare instead of old VectorX_compare which I'll remove shortly.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3587 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:27:21 +00:00
Giel van Schijndel b3a3cecaed Rename fractions.h to math-help.h and remove most junk from it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3584 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:01:37 +00:00