5366 Commits

Author SHA1 Message Date
Stefano Musumeci
2c8f2ecd0b TINYGL: Moved some variables from public to private access. 2014-08-13 21:13:50 +02:00
Stefano Musumeci
e58c1361fe TINYGL: Added const modifier to const variables. 2014-08-13 21:11:35 +02:00
Stefano Musumeci
6c83f83b6c TINYGL: Fixed line breaks. 2014-08-13 21:11:24 +02:00
Stefano Musumeci
a5e91722de TINYGL: moved global variable to GLContext 2014-08-13 21:03:42 +02:00
Stefano Musumeci
8969247730 TINYGL: Fixed minor style issues. 2014-08-13 21:00:18 +02:00
Stefano Musumeci
7cb1fd7c8b TINYGL: Added default values to Line empty constructor. 2014-08-13 20:51:53 +02:00
Stefano Musumeci
d0ce4482f9 GRIM: Changed the way strings are rendered. 2014-08-13 15:39:03 +02:00
Stefano Musumeci
85fdaed682 TINYGL: Added safe check on blit image delete. 2014-08-13 15:38:00 +02:00
Stefano Musumeci
92d8ecc34c TINYGL: Added depth test enabled state tracking to dirty rects. 2014-08-13 14:33:54 +02:00
Stefano Musumeci
e3acac6187 TINYGL: Merged conflicts 2014-08-13 14:27:10 +02:00
Stefano Musumeci
8abb5b008c Merge branch 'master' into tinygl-dirty-rects
Conflicts:
	graphics/tinygl/zbuffer.cpp
	graphics/tinygl/zbuffer.h
2014-08-13 14:06:34 +02:00
Joel Teichroeb
64b0baa7a1 Merge pull request #1008 from Akz-/emi-monkeys-fix
EMI: Fix the brass monkeys
2014-08-12 20:47:51 -07:00
Joel Teichroeb
7bdb466eff Merge pull request #1006 from Akz-/emi-ships
EMI: Sprite and shadow fixes
2014-08-12 20:47:48 -07:00
Joni Vähämäki
a5745f1554 EMI: Sort actors by id if distance is equal. 2014-08-12 23:52:15 +03:00
Joni Vähämäki
8d3ef741cd EMI: Print information to debug channel if an unknown sprite or texture flag is encountered. 2014-08-12 17:46:51 +03:00
Joni Vähämäki
40f5f7360f EMI: Fix alpha test in OpenGLS. 2014-08-12 17:46:50 +03:00
Joni Vähämäki
1de77d8625 EMI: Fix matrix concatenation order when drawing sprites in OpenGLS. 2014-08-12 17:46:49 +03:00
Joni Vähämäki
18df8a29f8 EMI: Disable lighting for actors that have lightMode == LightNone in OpenGLS. 2014-08-12 17:46:49 +03:00
Joni Vähämäki
c420196014 TINYGL: Always pass the depth test if TGL_DEPTH_TEST is disabled. 2014-08-12 17:46:48 +03:00
Joni Vähämäki
09b062acdd EMI: Parse light name from shadow data. 2014-08-12 17:46:47 +03:00
Joni Vähämäki
3df07c384e EMI: Fix parsing of sprite flags. Fixes #960 2014-08-12 17:46:47 +03:00
Joni Vähämäki
6b7b6fa6e5 EMI: Do not disable writing to color buffer if an actor's sort order is >= 100.
Fixes invisible Guybrush in the set unc.
2014-08-12 17:46:46 +03:00
Joni Vähämäki
398f2afa98 EMI: Always write sprites to the depth buffer. 2014-08-12 17:46:45 +03:00
Joni Vähämäki
ee24b2c12f EMI: Parse sprite Z offset. 2014-08-12 17:46:44 +03:00
Joni Vähämäki
055f742ccc EMI: Enable alpha blending if the mesh face flags has the 16th bit set.
This fixes drawing of the shadow mesh in the set unc when Guybrush is under the lights.
2014-08-12 17:46:43 +03:00
Joni Vähämäki
9a87fa5d51 EMI: Parse per-texture blending mode from model data. 2014-08-12 17:46:42 +03:00
Joni Vähämäki
c36f0b377b EMI: Return the effective sort order in GetActorSortOrder. 2014-08-12 17:46:41 +03:00
Joni Vähämäki
ffbba92e0e EMI: Enable drawing of mask sprites. 2014-08-12 17:46:41 +03:00
Joni Vähämäki
baa760d00a EMI: If sort orders are equal, compare distance to camera. 2014-08-12 17:46:40 +03:00
Joni Vähämäki
de049e0eaf EMI: If a sort order is specified for an actor that is attached to another, use the specified sort order instead of the parent's one. 2014-08-12 17:46:36 +03:00
Joni Vähämäki
4797ba9594 EMI: Correctly wrap the animation time when the animation duration is exceeded. Fixes #987 2014-08-12 00:32:31 +03:00
Joni Vähämäki
0ef3d24e15 EMI: Use uint instead of float for animation time. 2014-08-12 00:31:11 +03:00
Stefano Musumeci
8c13ef4c35 TINYGL: Added some comments to draw call classes. 2014-08-11 22:03:07 +02:00
Pawel Kolodziejski
eee0d30886 MYST3: use number of components 3 for TinyGL 2014-08-11 20:14:24 +02:00
Pawel Kolodziejski
aca58d5f00 Revert "TINYGL: allow use TGL_RGB as texture"
This reverts commit 4a2bbd7feea937ccb5eba00da061e6bdfc113881.
2014-08-11 19:43:49 +02:00
Pawel Kolodziejski
4a2bbd7fee TINYGL: allow use TGL_RGB as texture 2014-08-11 18:55:22 +02:00
Stefano Musumeci
5cd3cfe548 TINYGL: Fixed a bug with triangle strip rendering. 2014-08-11 17:24:21 +02:00
Stefano Musumeci
1990876f7a TINYGL: Added some more documentation. 2014-08-11 16:38:52 +02:00
Joel Teichroeb
9b0429042e Merge pull request #1003 from Akz-/emi-sounds-rebase
EMI: Fix demo crashes
2014-08-10 21:35:22 -07:00
Stefano Musumeci
c64e2884b2 TINYGL: Added some more documentation to blitting code. 2014-08-10 22:02:06 +02:00
Stefano Musumeci
4b9c5a7633 TINYGL: Wrong commit fixup. 2014-08-10 21:15:41 +02:00
Stefano Musumeci
6e75f6b594 TINYGL: Renamed rasterization functions template parameters with constants naming convention. 2014-08-10 20:31:07 +02:00
Stefano Musumeci
389bcba20d TINYGL: Renamed blit function template parameters with constants naming convention. 2014-08-10 20:29:09 +02:00
Stefano Musumeci
f43d39172b TINYGL: Refactored big complex if else sequence with template function calls. 2014-08-10 20:18:04 +02:00
Stefano Musumeci
d747cad5b2 TINYGL: Improved code commenting. 2014-08-10 20:17:31 +02:00
Stefano Musumeci
ff488253e7 TINYGL: Moved variable initialization in the appropriate line. 2014-08-10 19:39:56 +02:00
Stefano Musumeci
986d6a9d8b TINYGL: Minor line break fixup. 2014-08-10 19:39:38 +02:00
Stefano Musumeci
ca54fd848a TINYGL: Renamed member functions loadState to captureState. 2014-08-10 19:39:21 +02:00
Stefano Musumeci
28214fe84e TINYGL: Added preprocessor variable to enable/disable dirty rects debug. 2014-08-10 19:38:46 +02:00
Stefano Musumeci
5adba756e3 TINYGL: Renamed tglBlitScissorRect into tglBlitSetScissorRect 2014-08-10 19:38:06 +02:00