zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-18 10:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity
5885 commits 2 branches 1 tag 128 MiB
Commit graph

2340 commits

Author SHA1 Message Date
hendricks266
7e12cf2a83 jwzgles: Add glCompressedTexImage2D and glCompressedTexSubImage2D as cheap copies of their non-compressed variants. 
git-svn-id: https://svn.eduke32.com/eduke32@5676 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-28 05:15:20 +00:00
hendricks266
1c3ed04bcd jwzgles: Allow using RGBA as the input texture format for an alpha-less internal texture format. 
git-svn-id: https://svn.eduke32.com/eduke32@5675 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-28 05:15:17 +00:00
hendricks266
82e9e4e304 jwzgles: Revert part of r5655 that wiped out my cast-qual fixes from r5551. 
git-svn-id: https://svn.eduke32.com/eduke32@5674 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-28 05:15:14 +00:00
hendricks266
84c949c419 Engine: Clean up texcache_enabled. 
git-svn-id: https://svn.eduke32.com/eduke32@5673 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-28 05:15:10 +00:00
hendricks266
3bbe30a6f8 Un-break the iOS build. 
git-svn-id: https://svn.eduke32.com/eduke32@5672 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-28 05:15:05 +00:00
terminx
6363de0a4c Fix drawing voxels with ids >= 256 
git-svn-id: https://svn.eduke32.com/eduke32@5671 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-16 00:22:44 +00:00
terminx
34f208afa2 Make sprite tails and label borders purple if the sprite is blocking. 
git-svn-id: https://svn.eduke32.com/eduke32@5670 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-15 22:17:04 +00:00
terminx
99cb974d0c Fix Mapster32 sprite selection colors when using a tiles.cfg that defines tile groups using colors from the bright half of the original 16-color palette. 
In layman's terms, this fixes the effect sprites flashing black in 2d mode.

git-svn-id: https://svn.eduke32.com/eduke32@5669 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:08:02 +00:00
terminx
eeea08cfa6 Fix a bug where cvars of type CVAR_UINT couldn't be set to values larger than a signed int due to clamping by atoi/atol. 
git-svn-id: https://svn.eduke32.com/eduke32@5666 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:52 +00:00
terminx
1b5335ad72 Add #pragma once to the top of a couple of the most commonly included headers in build/include. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5664 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:44 +00:00
terminx
4ea156822d Android UI work. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5663 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:40 +00:00
terminx
e2c24bda95 Android stuff. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5661 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:28 +00:00
terminx
83acadd3b4 Remove useless bytesperline parameter from a couple of kplib functions. 
git-svn-id: https://svn.eduke32.com/eduke32@5660 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:22 +00:00
terminx
8257e199fd Disable gamma based brightness with GL ES because it's too slow. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5659 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:18 +00:00
terminx
2a55c890e0 Remove a couple of apparently unncessary glPushMatrix()/glPopMatrix() calls. 
git-svn-id: https://svn.eduke32.com/eduke32@5658 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:15 +00:00
terminx
b999c714ba A couple of jwzgles fixes for mobile, from a newer version of xscreensaver. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5655 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:07:04 +00:00
terminx
2b357b58f1 Android work. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5652 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-14 00:06:54 +00:00
hendricks266
dd0f16875f Engine: Add one-bit alpha detection for hightile and model skins. 
git-svn-id: https://svn.eduke32.com/eduke32@5649 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-07 11:22:02 +00:00
hendricks266
e9d3b4cc43 Polymost: Add r_texcompr 2, which compresses ART in addition to hightile. 
git-svn-id: https://svn.eduke32.com/eduke32@5648 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-07 11:21:58 +00:00
hendricks266
7dd054069f Polymost: Add HICR_ARTIMMUNITY and DAMETH_ARTIMMUNITY, which currently function identically to NOTEXCOMPRESS and NODOWNSIZE combined, and are only used when: 
1. Using an ART tile
2. Using a hightile defined through the tilefromtexture "texture" subtoken
3. Using a hightile that, if downsized, will be smaller than the ART tile for that tilenum (tenuous)

git-svn-id: https://svn.eduke32.com/eduke32@5647 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-07 11:21:55 +00:00
hendricks266
c73e8c5036 Fix mistakes in r5642. 
git-svn-id: https://svn.eduke32.com/eduke32@5645 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-07 11:21:46 +00:00
hendricks266
7011b30e50 Engine: Move daskinloader into mdloadskin and clean up it and gloadtile_hi against one another. 
git-svn-id: https://svn.eduke32.com/eduke32@5644 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-03-04 19:24:54 +00:00
hendricks266
506e89fefb Polymost: Refactor all GL internal texture format decision making into uploadtexture(). 
This directly achieves the following:
* Eliminated codedup.
* Recently introduced GL ES performance downsampling now applies to model skins.
* Replaces the alpha/art format distinction with {RGB/no alpha, RGBA/one-bit alpha (ART transparency), RGBA/full alpha}.
* Cleanly allows multiple fallback formats for each type.
* Ready for further commits.

git-svn-id: https://svn.eduke32.com/eduke32@5642 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-29 06:34:20 +00:00
hendricks266
aec2da83cd Add BuildGLErrorCheck(), useful for debugging GL. 
git-svn-id: https://svn.eduke32.com/eduke32@5641 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-29 06:34:16 +00:00
hendricks266
e2df2d60d1 Engine: Rename HICR_NOCOMPRESS to HICR_NODOWNSIZE, CACHEAD_NOCOMPRESS to CACHEAD_NODOWNSIZE, DAMETH_NOCOMPRESS to DAMETH_NODOWNSIZE, and HICR_NOSAVE to HICR_NOTEXCOMPRESS. 
git-svn-id: https://svn.eduke32.com/eduke32@5640 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-29 06:34:12 +00:00
hendricks266
d88df093a7 Windows: Remove OS version guard. Unsupported versions will fail to run in the first place due to missing symbol errors. 
git-svn-id: https://svn.eduke32.com/eduke32@5639 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-29 06:34:08 +00:00
hendricks266
85d1fa60c8 Windows: Re-add pre-XP version strings. 
git-svn-id: https://svn.eduke32.com/eduke32@5638 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-29 06:34:04 +00:00
hendricks266
92d223aa36 More SDL 1.2 on Windows stuff that should not have been removed in r4749 and was missed in r4774. 
git-svn-id: https://svn.eduke32.com/eduke32@5637 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-29 06:34:01 +00:00
hendricks266
dce9e3c91e Add preprocessor token NO_ALIGNED_MALLOC which disables compilation with aligned memory allocation. Useful for old versions of Windows and Mac OS X. 
git-svn-id: https://svn.eduke32.com/eduke32@5636 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-29 06:33:58 +00:00
terminx
d3ff92c5d5 Android shit. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5629 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-17 19:08:32 +00:00
terminx
5672004ba1 Android crap. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5625 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-13 21:06:28 +00:00
terminx
facae6f175 Add some debug assertions for the hash table stuff. 
git-svn-id: https://svn.eduke32.com/eduke32@5624 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-13 21:06:21 +00:00
terminx
66e6bbff0d Add support for changing the refresh rate in SDL builds. Should also fix non-SDL builds. 
git-svn-id: https://svn.eduke32.com/eduke32@5621 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-13 21:06:12 +00:00
terminx
0edf078f0c Fix Polymost issue reported at https://forums.duke4.net/topic/8470-weirdness-of-players-sprite-in-view-modef7/ 
git-svn-id: https://svn.eduke32.com/eduke32@5605 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-02-02 00:21:27 +00:00
terminx
4861b13c6e Fix Polymer wall updating 
git-svn-id: https://svn.eduke32.com/eduke32@5597 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-27 10:28:00 +00:00
hendricks266
a61d1b6a11 Lunatic: Fix discarded-qualifiers warnings. 
git-svn-id: https://svn.eduke32.com/eduke32@5591 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-27 07:30:28 +00:00
hendricks266
f1d187d378 Lunatic: Fix cast-qual warnings having to do with L_RunString. 
git-svn-id: https://svn.eduke32.com/eduke32@5590 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-27 07:30:23 +00:00
hendricks266
7f5654879d Clean up some cvar definitions. 
git-svn-id: https://svn.eduke32.com/eduke32@5589 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-27 07:30:18 +00:00
terminx
86a4660f08 const stuff 
git-svn-id: https://svn.eduke32.com/eduke32@5572 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-21 19:35:06 +00:00
terminx
eacd9527a3 Mapster32: configurable point and line highlight/selection distances 
git-svn-id: https://svn.eduke32.com/eduke32@5568 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-15 07:58:57 +00:00
hendricks266
2beee7056c iOS: Eliminate some minor warnings. 
git-svn-id: https://svn.eduke32.com/eduke32@5558 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-12 10:31:19 +00:00
hendricks266
95a70e063d OS X: Fix Polymer build. 
git-svn-id: https://svn.eduke32.com/eduke32@5557 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-12 10:31:15 +00:00
hendricks266
a35f3b13dc Replace the semicolon trailing empty-bodied loops with opening and closing braces. 
I believe this is the clearest way to indicate that an empty-bodied loop is intended, as opposed to the possibility of a mistaken semicolon.

This eliminates "warning: suggest a space before ‘;’ or explicit braces around empty body in ‘for’ statement" with GCC 4.2, which is important for old OS X versions.

git-svn-id: https://svn.eduke32.com/eduke32@5556 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-12 10:31:12 +00:00
hendricks266
344e10628f Part two of more const casting, this time affecting argv instances. 
git-svn-id: https://svn.eduke32.com/eduke32@5552 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-12 10:30:56 +00:00
hendricks266
98ebda94ec Address some const-disregarding casts missed in r5540 due to conditional compilation settings and platforms. 
git-svn-id: https://svn.eduke32.com/eduke32@5551 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-12 10:30:48 +00:00
hendricks266
da1081112c Winlayer: Bound code with USE_GLEXT where missed in r5526. 
Also make some dead GL debugging code not dead during debug builds.

git-svn-id: https://svn.eduke32.com/eduke32@5550 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-12 10:30:40 +00:00
terminx
db8b4a00b6 Enable -Wwrite-strings and fix all instances where string constants were passed to functions accepting a char ptr. 
git-svn-id: https://svn.eduke32.com/eduke32@5547 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-11 05:06:10 +00:00
terminx
e27eb7a7e5 Use XXH64 functions for editor undo/redo when building for 64-bit. 
git-svn-id: https://svn.eduke32.com/eduke32@5546 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-11 05:06:02 +00:00
terminx
df32b0b788 Update to the newest version of xxHash. 
git-svn-id: https://svn.eduke32.com/eduke32@5542 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-11 05:05:47 +00:00
terminx
a7e6ed8745 Fix quite a few issues with casting away const and volatile qualifiers, found with -Wcast-qual. If we're going to use const everywhere, we should really mean it! 
git-svn-id: https://svn.eduke32.com/eduke32@5540 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-11 05:05:38 +00:00
terminx
8fc803fee3 Negligible change to OS string printed at startup. 
git-svn-id: https://svn.eduke32.com/eduke32@5539 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-11 05:05:25 +00:00
terminx
88e08319b9 Clean up some of the SDL version number spam at startup. 
git-svn-id: https://svn.eduke32.com/eduke32@5536 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-11 05:05:16 +00:00
hendricks266
2e968b90bf Add inthashtable_t, mapping intptr_t to intptr_t. 
git-svn-id: https://svn.eduke32.com/eduke32@5532 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-08 01:33:46 +00:00
hendricks266
28a9372a79 Enable models by default under EDUKE32_GLES, because they now work! 
git-svn-id: https://svn.eduke32.com/eduke32@5528 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-08 01:33:28 +00:00
hendricks266
8e52d7b1f7 Fix miscellaneous GL ES warnings 
git-svn-id: https://svn.eduke32.com/eduke32@5527 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-08 01:33:25 +00:00
hendricks266
e00115c043 Introduce USE_GLEXT macro and use it to conditionally compile out all GL ARB function calls when compiling for GL ES platforms. 
This replaces the previous hack where we kept the dynamic pointers null and simply never tried calling any of them by a conspiracy of default runtime settings and disabled menu options.

Code affected: VBO support for models, VPX GLSL decoding, texture compression (texture cache), and multitexturing (glow/detail maps).

This commit also replaces EDUKE32_GLES conditionals with USE_GLEXT where appropriate.

I didn't touch polymer.c because it depends too heavily on extensions for conditionally compiling them to make sense.

git-svn-id: https://svn.eduke32.com/eduke32@5526 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-08 01:33:20 +00:00
hendricks266
ff80e020ad jwzgles: fix warnings when compiling on Linux 
git-svn-id: https://svn.eduke32.com/eduke32@5525 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-08 01:33:15 +00:00
hendricks266
8d73dca2d2 jwzgles: uncomment stub glPush/PopAttrib so that the editor links 
git-svn-id: https://svn.eduke32.com/eduke32@5524 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-08 01:33:11 +00:00
hendricks266
409b14fb62 jwzgles: fix errors when compiling on Linux 
git-svn-id: https://svn.eduke32.com/eduke32@5523 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-08 01:33:08 +00:00
terminx
7bbd2c8ffd Misc cleanup, add shorthand versions of getplayer, getactor, etc. 
git-svn-id: https://svn.eduke32.com/eduke32@5505 1a8010ca-5511-0410-912e-c29ae57300e0
 2016-01-03 20:07:24 +00:00
terminx
935e9fa197 Fix hard coded white and red color indexes used in on-screen debug output, to better operate with a palette dissimilar to Duke3D. 
git-svn-id: https://svn.eduke32.com/eduke32@5497 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-28 02:04:36 +00:00
hendricks266
7f5a8f9a23 Polymost: Make voxels take on the current basepalette, like they should. 
git-svn-id: https://svn.eduke32.com/eduke32@5494 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-26 15:42:09 +00:00
hendricks266
223e67983d Polymost: Fix voxels so palette colors are treated as 8-bit, not 6-bit. Overlooked in r5349. 
git-svn-id: https://svn.eduke32.com/eduke32@5493 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-26 15:42:05 +00:00
terminx
81d286dcc4 Fix CLANG warnings 
git-svn-id: https://svn.eduke32.com/eduke32@5491 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:06:28 +00:00
terminx
c00f933a37 Update LZ4 
git-svn-id: https://svn.eduke32.com/eduke32@5485 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:06:05 +00:00
terminx
32ba947b4b Fix cstat 1024 in classic and Polymer 
git-svn-id: https://svn.eduke32.com/eduke32@5484 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:05:58 +00:00
terminx
c9fefe641d Increase Polymost depth fighting mitigation offset, plus some other minor changes that shouldn't affect anything. 
git-svn-id: https://svn.eduke32.com/eduke32@5482 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:05:51 +00:00
terminx
2500c7b517 Add support for sector/wall/sprite struct trackers to Polymer 
git-svn-id: https://svn.eduke32.com/eduke32@5481 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:05:47 +00:00
terminx
40a2780eb0 Split Polymer artmap setup into polymer_setupartmap() 
git-svn-id: https://svn.eduke32.com/eduke32@5480 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:05:43 +00:00
terminx
61059816b8 Use a hash table for finding Polymer buckets 
git-svn-id: https://svn.eduke32.com/eduke32@5479 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:05:39 +00:00
terminx
242b6bf870 Appease clang 
git-svn-id: https://svn.eduke32.com/eduke32@5478 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-23 04:05:35 +00:00
hendricks266
1b8c79b0d8 Polymodes: In gloadtile_art, (1) get the current texel's index, (2) apply alpha if index == 255, (3) get the index by indexing into the specified palookup table, and then (4) apply fullbright considerations. Previously these tasks were performed in order 1432. 
git-svn-id: https://svn.eduke32.com/eduke32@5467 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-20 05:18:47 +00:00
hendricks266
38dfb0a2b2 Polymodes: Add a new pthtyp flag to mark textures that should not be processed by the fixtransparency() hack (which avoids the transparent color blending into a sprite when texture filtering is enabled), such as non-(T)ROR-masking floors and ceilings, white- and mask-walls, paper-skies, and rotatesprite with orientation flag 64. This commit makes sure the flag's status always fits the situation. 
This fixes the remaining issue with WWII GI's LOGO.ANM: Color index #255 is used as the dominant white color (not as a transparent index) and fixtransparency() was mangling the image as a result.

git-svn-id: https://svn.eduke32.com/eduke32@5465 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-04 11:52:58 +00:00
hendricks266
56f331574d Polymost: Enumify the lower bits of the method/dameth argument to various functions. 
git-svn-id: https://svn.eduke32.com/eduke32@5464 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-12-04 11:52:54 +00:00
hendricks266
4abd453bcf Fix orientation bit 64 when applied to a tile with fullbrights in OpenGL with r_fullbrights enabled. 
This fixes (the most glaringly wrong problem) with WWII GI's LOGO.ANM in OpenGL, exposed by r5437.

git-svn-id: https://svn.eduke32.com/eduke32@5460 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-28 09:06:34 +00:00
hendricks266
a5ce52dc78 Fix compiler warnings when building for 32-bit. 
git-svn-id: https://svn.eduke32.com/eduke32@5456 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-28 09:06:22 +00:00
hendricks266
af5f47797d cache1d: Add kfileparent(). 
git-svn-id: https://svn.eduke32.com/eduke32@5443 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:08:00 +00:00
hendricks266
9f2911e773 cache1d: Bikeshed some formatting in kopen_internal(). 
git-svn-id: https://svn.eduke32.com/eduke32@5442 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:07:57 +00:00
hendricks266
4d9b61c085 cache1d: Save the filenames of GRP and SSI files that are opened. 
git-svn-id: https://svn.eduke32.com/eduke32@5441 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:07:54 +00:00
hendricks266
d723316bf5 Polymodes: Don't test (!usemodels || md_tilehasmodel(picnum, pal) < 0) in eligible_for_tileshades (called only from getshadefactor) because getshadefactor is only called when a model is *not* being drawn, and therefore results in incorrect shading when drawing a tile with a model defined and models enabled to the screen or as a skybox. 
git-svn-id: https://svn.eduke32.com/eduke32@5440 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:07:51 +00:00
hendricks266
34bf6443ce Polymodes: Slight optimizations in getshadefactor. 
git-svn-id: https://svn.eduke32.com/eduke32@5439 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:07:47 +00:00
hendricks266
7d3cbf4f83 Polymost: Bookend the recursive call to polymost_drawpoly as part of the fullbright pass with bglDepthFunc(GL_EQUAL) and bglDepthFunc(GL_LEQUAL) to ensure that the fullbright overlay is always visible and never fights with the sprite itself. 
git-svn-id: https://svn.eduke32.com/eduke32@5438 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:07:44 +00:00
hendricks266
0646835719 Polymost: Remove "indrawroomsandmasks" variable and its only use in polymost_drawpoly as a condition for the fullbright pass. 
git-svn-id: https://svn.eduke32.com/eduke32@5437 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:07:41 +00:00
hendricks266
f05bd1377f Polymost: Connect spriteext[].x/ypanning to model UVs (range 0-255). 
git-svn-id: https://svn.eduke32.com/eduke32@5436 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-25 12:07:36 +00:00
helixhorned
6e9203ea23 Mapster32: in drawspritelabel(), use fixed background color. 
Make it always one of the colors that the 2D color cycles to
(base color + offset in [0 .. 4]) instead of <base color>-3, as
that one might be in a different color ramp.

git-svn-id: https://svn.eduke32.com/eduke32@5434 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-20 20:26:52 +00:00
helixhorned
f8076f9207 Mapster32: honor "blocking color" declared with DEF 'spritecol' et al. 
Meaning tilegroup's 'colors' directive.

Also, to the packaged tiles.cfg, add a description of how to emulate the
earlier Mapster32 sprite coloring for one tile group.

git-svn-id: https://svn.eduke32.com/eduke32@5429 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-14 23:40:59 +00:00
helixhorned
eb863ef1dc Mapster32: introduce DEF command "2dcolidxrange <col> <idx> <idxend>". 
<col> is the editorcolor[] starting index
<idx> is the actual color index start
<idxend> is the actual color index end

So, editor colors from <col> onward will be mapped to
[<idx> .. min(<idxend>, 255)].

Takes precedence over '2dcol'.

git-svn-id: https://svn.eduke32.com/eduke32@5427 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-14 23:40:57 +00:00
helixhorned
5e61b28ebc Mapster32: in drawscreen_drawsprite(), "sprite[j]." -> "spr->". 
Also a similar stylistic tweak in parsetilegroups().

git-svn-id: https://svn.eduke32.com/eduke32@5426 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-14 23:40:56 +00:00
helixhorned
185262be73 Mapster32: formatting changes around 2D sprite/wall color code. 
git-svn-id: https://svn.eduke32.com/eduke32@5425 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-14 23:40:54 +00:00
helixhorned
29e16fb6c9 Mapster32: fix variable that is used uninitialized. 
git-svn-id: https://svn.eduke32.com/eduke32@5423 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-14 17:21:15 +00:00
helixhorned
e272252664 Mapster32: remove "Ludicrous Zoom!" message when reaching max 2D zoom. 
The problem is that it stays a few seconds afterwards, obscuring
information on the status line.

git-svn-id: https://svn.eduke32.com/eduke32@5421 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-14 17:21:13 +00:00
helixhorned
51489e44d4 Mapster32: add var 'corruptcheck_game_duke3d' and enable by default. 
Currently, this checks for effector sprites that are not face-aligned.
See
https://forums.duke4.net/topic/8324-icestation-colossus-map-broken

git-svn-id: https://svn.eduke32.com/eduke32@5420 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-14 17:21:11 +00:00
hendricks266
72039e80ee baselayer.c: Remove nested "#ifdef USE_OPENGL"s left over from the removal of the POLYMOST macro. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5419 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-02 17:07:54 +00:00
hendricks266
86d45478d4 Polymost: Clean up formatting of parallax sky code and comments, in part so that the floor and ceiling sections are line-for-line consistent. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5417 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-01 19:56:33 +00:00
hendricks266
a07e8cfc70 Build tools/arttool: Port commit f874a10ef136f4de3c9a9cccf3eacd886bae0d2d from JFBuild: improved with info dumping and tile export 
git-svn-id: https://svn.eduke32.com/eduke32@5416 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-01 19:56:30 +00:00
hendricks266
b98953cc7c Build tools/arttool: long --> int 
git-svn-id: https://svn.eduke32.com/eduke32@5415 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-01 19:56:27 +00:00
hendricks266
13c7b771a3 Use the script parser for names files instead of custom parsing. This allows names files to define labels as other labels. 
git-svn-id: https://svn.eduke32.com/eduke32@5414 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-11-01 19:56:22 +00:00
helixhorned
3a7ed49c9a Mapster32: various stylistic tweaks, no functional changes. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5413 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-31 19:35:25 +00:00
helixhorned
8f5c6ab05a Mapster32: in TROR-join sectors [Ctrl+J], print z difference hint. 
At the very least, this makes it easier to decide for one option
("Connect yellow ceiling w/ blue floor (1) or (v)ice versa?")
when one of the differences is zero, which might have occurred from
temporarily breaking TROR links.

git-svn-id: https://svn.eduke32.com/eduke32@5412 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-31 15:13:33 +00:00
helixhorned
d824ddf406 Mapster32: fix fillsector() calls before fade_editor_screen(). 
The latter allows one to specify a color to keep, but with r5302 the
fillsector() highlights are drawn with transparency, thus making it ineffective.
Add an argument to toggle transparency to fillsector()
(now fillsector_maybetrans()) and two wrapper functions.

git-svn-id: https://svn.eduke32.com/eduke32@5411 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-31 15:13:32 +00:00
helixhorned
d9d8a56abf Mapster32: don't offer to "Insert outer loop and make red walls" w/ RAlt+RCtrl. 
This feature only makes sense with the complete de-selection of a set of
sectors, i.e. when pressing RAlt to do this, not adding or removing sectors
to/from the set of already highlighted ones.

git-svn-id: https://svn.eduke32.com/eduke32@5410 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-31 15:13:29 +00:00
terminx
ad8da7be99 Fix cstat 1024 with Polymer 
git-svn-id: https://svn.eduke32.com/eduke32@5407 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-23 23:00:25 +00:00
terminx
f22dbc6fdb Add r_pr_lighting 2, which disables the hard-coded lights while leaving lights added in maps enabled. 
This also adds a menu option to control r_pr_lighting.

git-svn-id: https://svn.eduke32.com/eduke32@5406 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-23 23:00:21 +00:00
terminx
3ae7f7ade3 Check whether the sprite is a wall, floor, or face sprite when deciding whether to bump it ahead of another entry based on position and owner. 
git-svn-id: https://svn.eduke32.com/eduke32@5405 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-23 23:00:16 +00:00
terminx
5b24fc4f42 Improve depth fighting mitigation for floor aligned sprites. 
git-svn-id: https://svn.eduke32.com/eduke32@5403 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-23 23:00:10 +00:00
terminx
7eec6b36a5 Sprite sorting changes: 
-Sort by owner now occurs only when two sprites have matching x/y coordinates.
-Cstat 1024 now activates a special drawing mode that indicates a sprite should be drawn without depth after all other sprites have been drawn. The previous cstat 1024 functionality, an internal hack for shadows cast by models in Polymost, has been moved to bit 1 of a new graphical effects bitfield stored in a tsprite's .extra member.

git-svn-id: https://svn.eduke32.com/eduke32@5400 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-21 19:54:14 +00:00
terminx
b166a13d50 Tweak the amount that distance is factored in when mitigating depth fighting in Polymost. 
git-svn-id: https://svn.eduke32.com/eduke32@5398 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-21 19:54:06 +00:00
terminx
6bf2a897c6 Minor cleanup to previous commit. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@5396 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-21 19:53:57 +00:00
terminx
38080520ef Additional depth fighting mitigation for face sprites 
git-svn-id: https://svn.eduke32.com/eduke32@5395 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-20 07:15:28 +00:00
terminx
0a59779460 Sort tsprites by owner as a replacement for the sort by statnum removed by Helixhorned a while back. Seems sensible enough... 
git-svn-id: https://svn.eduke32.com/eduke32@5394 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-20 07:15:25 +00:00
terminx
45644d25e5 New attempt at fixing the depth fighting with wall and floor-aligned sprites. 
git-svn-id: https://svn.eduke32.com/eduke32@5391 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-20 07:15:15 +00:00
terminx
470449a963 Fix saving and loading crosshaircolor, and fix fps counter color when using a palette that doesn't correspond to Duke3D's color indexes. 
git-svn-id: https://svn.eduke32.com/eduke32@5387 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-20 07:15:01 +00:00
terminx
e30ab0068e Mapster32: fix 2d3d mode input issue when sector is -1 
git-svn-id: https://svn.eduke32.com/eduke32@5385 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-20 07:14:52 +00:00
hendricks266
f2a99dec75 Fix a crash in the editor when the basepalette is loaded from def instead of PALETTE.DAT, caused by trying to getclosestcol() without having initialized the colormatching code. Exposed in r5359; previously resulted only in erroneous matching to an all-#000000 palette. 
git-svn-id: https://svn.eduke32.com/eduke32@5384 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-10 06:57:57 +00:00
hendricks266
d58bfb59dd Since gcc 4.2 complains about it on OS X 10.7, use initputs instead of initprintf when printing a single argument, even if it is already char const *. 
git-svn-id: https://svn.eduke32.com/eduke32@5383 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-10 06:57:54 +00:00
hendricks266
6f51a571aa Fix two unused function warnings in mdsprite.c when building with POLYMER=0. 
git-svn-id: https://svn.eduke32.com/eduke32@5381 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-10 06:57:49 +00:00
hendricks266
d6f06b9123 OS X: Fix -Wdeprecated-declarations compiler warnings in the startup windows. 
git-svn-id: https://svn.eduke32.com/eduke32@5380 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-10 06:57:46 +00:00
hendricks266
f149bb0fbc OS X: Fix POLYMER=0 build. 
git-svn-id: https://svn.eduke32.com/eduke32@5379 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-10 06:57:41 +00:00
hendricks266
b6ba1fc36a Fix some critical mistakes in my new def code (r5351 and r5367) caused by gaps in my attention. 
git-svn-id: https://svn.eduke32.com/eduke32@5377 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-10 06:57:36 +00:00
hendricks266
a0018555ee Split the colormatching portion of getclosestcol_lim into getclosestcol_nocache_lim in case speed is desired when processing an image with mostly unique colors. 
git-svn-id: https://svn.eduke32.com/eduke32@5376 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-10 06:57:32 +00:00
hendricks266
f232b2fa51 Move PaletteIndexFullbrights back into the engine and autodetect fullbrights instead of hardcoding them. 
git-svn-id: https://svn.eduke32.com/eduke32@5373 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-03 11:53:13 +00:00
hendricks266
38fa1454d8 Reverse the iteration direction of the getclosetcol fallback loop, preferring the tiebreaking color to be the first one numerically in the palette, not the last. 
git-svn-id: https://svn.eduke32.com/eduke32@5371 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-03 11:53:05 +00:00
hendricks266
9991201f04 Fix a typo in loadpalette that broke reading of the lognumalphatabs byte. 
git-svn-id: https://svn.eduke32.com/eduke32@5370 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-03 11:53:02 +00:00
hendricks266
5c09daf294 Add forgotten newlines to error messages in loadpalette(). 
git-svn-id: https://svn.eduke32.com/eduke32@5369 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-03 11:52:59 +00:00
hendricks266
8437d22bf2 Before aliasing empty palookups to #0, check existing ones if they are identical to #0, and if so, also alias them. This saves memory in Polymost with tileshades enabled. 
git-svn-id: https://svn.eduke32.com/eduke32@5368 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-03 11:52:56 +00:00
hendricks266
cac05f8305 Defs: Add "undef" subtokens to and undef-range versions of basepalette, palookup, and blendtable. 
git-svn-id: https://svn.eduke32.com/eduke32@5367 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-10-03 11:52:51 +00:00
hendricks266
3a8cd4ccb0 Defs: Add "numalphatables" token, which serves the same purpose as the lognumalphatabs byte in PALETTE.DAT. 
git-svn-id: https://svn.eduke32.com/eduke32@5366 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-27 21:18:24 +00:00
hendricks266
8f3ee25ae0 Fix error in r5346 that broke the MoreBlendTab section of PALETTE.DAT. 
git-svn-id: https://svn.eduke32.com/eduke32@5365 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-27 21:18:21 +00:00
hendricks266
b0bde3ace5 Fix RENDERTYPE=WIN build by changing a const char* to a char*, which had been cast to (void *) before passing to free() (which is bad practice) prior to r5352. 
git-svn-id: https://svn.eduke32.com/eduke32@5364 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-27 21:18:19 +00:00
hendricks266
a43cd066fb Build tools: Clean up transpal and link it to colmatch.c instead of including a separate copy of the (old!) getclosestcol code. 
git-svn-id: https://svn.eduke32.com/eduke32@5363 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-27 21:18:16 +00:00
hendricks266
ff416551ce Split the initialization of the pragma.h's libdivide tables into its own function. 
git-svn-id: https://svn.eduke32.com/eduke32@5362 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-27 21:18:12 +00:00
hendricks266
5f2b662c77 Split the getclosestcol functions into a new object, colmatch. 
git-svn-id: https://svn.eduke32.com/eduke32@5359 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-27 21:17:59 +00:00
hendricks266
c754c3a95d Defs: Clean up the animtilerange token so that it is possible to specify backward animations in the logical tile1 > tile2 way. 
git-svn-id: https://svn.eduke32.com/eduke32@5357 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-24 06:32:01 +00:00
hendricks266
59a4f0e8ba Defs: Fix a bug with the tilefromtexture { texture } subtoken, where alphacut was interpreted in an inverse fashion, generally causing hightile textures defined this way to appear completely transparent. 
git-svn-id: https://svn.eduke32.com/eduke32@5356 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-24 06:31:58 +00:00
hendricks266
a557eedf7e Remove NULL checks before calling free(): they are unnecessary as per the C standard. Other cleanup includes factoring code into DO_FREE_AND_NULL() macros. 
git-svn-id: https://svn.eduke32.com/eduke32@5352 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:55:31 +00:00
hendricks266
1ca367960f Defs: Add basepalette, palookup, and blendtable tokens. 
git-svn-id: https://svn.eduke32.com/eduke32@5351 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:55:19 +00:00
hendricks266
18a3d07ef1 Defs: Prevent tilefromtexture from ever assigning index #255 (the transparent color) to the processed image. 
git-svn-id: https://svn.eduke32.com/eduke32@5350 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:55:15 +00:00
hendricks266
064461a06f Internally, work with 24-bit palettes instead of 18-bit. 
git-svn-id: https://svn.eduke32.com/eduke32@5349 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:55:11 +00:00
hendricks266
c0e7dba4c1 Restructure the basepaltable subsystem to support up to 256 palettes and use dynamic allocation like palookup and blendtable. 
git-svn-id: https://svn.eduke32.com/eduke32@5348 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:55:02 +00:00
hendricks266
2a237a3d72 Don't error out when lookup.dat can't be read. 
git-svn-id: https://svn.eduke32.com/eduke32@5347 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:54:55 +00:00
hendricks266
ce7a20d4f2 Restructure loadpalette() so that read errors are not immediately fatal and enforce that the necessary parts have been loaded in E_PostInit (after loaddefinitionsfile()). 
git-svn-id: https://svn.eduke32.com/eduke32@5346 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:54:50 +00:00
hendricks266
43459780af Engine: Add E_PostInit, called from the game after loaddefinitionsfile(). 
git-svn-id: https://svn.eduke32.com/eduke32@5345 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-23 17:54:42 +00:00
Plagman
6de7ed8d72 sd 
git-svn-id: https://svn.eduke32.com/eduke32@5344 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-11 21:36:57 +00:00
helixhorned
1ea397d0b4 Mapster32: RCtrl+RAlt (+['] or [;]) selects sectors in 3D mode, by The Mechanic. 
git-svn-id: https://svn.eduke32.com/eduke32@5339 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-09-05 08:30:59 +00:00
helixhorned
f7982e11c5 Mapster32: after playtesting with Esc+[T], break from the key polling loop. 
Bug noticed and fix located by The Mechanic.

git-svn-id: https://svn.eduke32.com/eduke32@5336 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-08-29 17:43:40 +00:00
hendricks266
c052540d42 Fix USE_OPENGL=0 build. 
git-svn-id: https://svn.eduke32.com/eduke32@5332 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-08-15 21:28:49 +00:00
hendricks266
4360b89fb5 M32: Add EVENT_PREDRAW2DSCREEN. 
git-svn-id: https://svn.eduke32.com/eduke32@5329 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-08-15 21:28:05 +00:00
helixhorned
607f8e1d1c SDL2 layer: handle all Ctrl+[A-Z] keys passed to OSD_HandleChar(). 
See that function for a list of what these do in the OSD.

git-svn-id: https://svn.eduke32.com/eduke32@5324 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-08-09 09:58:45 +00:00
helixhorned
c3fa10ab07 OSD: fix oob write for Ctrl+K ("delete all to end of line"). 
git-svn-id: https://svn.eduke32.com/eduke32@5323 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-08-09 09:58:44 +00:00
helixhorned
0dc20f913c Mapster32: call AppGrabMouse() on show/retract OSD like in the game. 
This is necessary to hide the mouse cursor in some settings (such as
with the debug build under Xfce). DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5321 1a8010ca-5511-0410-912e-c29ae57300e0
 2015-08-08 11:03:07 +00:00