Rachael Alexanderson
473f880d11
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-12-28 01:44:46 -05:00
Christopher Bruns
a3399c1af2
Fix: Bind the default framebuffer before testing whether hardware stereo 3D is supported. This allows Nvidia 3D vision glasses to function correctly when gl_light_shadowmap is ON.
...
Doc: Add "requires restart" to "enable quad stereo" option menu label, to help folks trying to setup 3D.
2017-12-27 17:50:53 -05:00
Rachael Alexanderson
1eff60cdea
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-12-17 11:53:08 -05:00
alexey.lysiuk
0afc09678f
Fixed bright sprites in sectors with Doom 64 lighting
...
https://forum.zdoom.org/viewtopic.php?t=58703
2017-12-16 17:37:03 +02:00
Rachael Alexanderson
db8a7706d1
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-12-13 14:16:51 -05:00
Rachael Alexanderson
1559d74c2c
- repaired the video scaling code
2017-12-10 04:22:28 -05:00
Rachael Alexanderson
5e66a143fe
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-12-07 08:18:14 -05:00
alexey.lysiuk
5162e7162e
Fixed overbright screenshots with hardware gamma off
...
When render buffers are used to apply gamma/brightness/contrast screenshots should not use PNG gamma correction
2017-12-06 11:24:10 +02:00
Rachael Alexanderson
505c99b0a8
- fixed: doublize more internal structures, even if they still get converted to float later
2017-12-04 17:39:57 -05:00
Rachael Alexanderson
230ef14290
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-12-04 02:19:40 -05:00
Rachael Alexanderson
0fa74220c9
- fixed: doublize sky float, in order to make it more smooth
2017-12-03 12:39:24 -05:00
Christoph Oelckers
ebf5c5763e
- removed the unused bitmap loading and saving features from hqnx_asm/hqnx_asm_Image.
2017-12-02 12:15:26 +01:00
Rachael Alexanderson
0612eeae1f
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-11-28 17:43:03 -05:00
alexey.lysiuk
0667f2ec55
Fixed string format issues reported by GCC/Clang
...
d_net.cpp:2874:25: warning: format specifies type 'int' but the argument has type 'unsigned long long' [-Wformat]
gl/utility/gl_clock.cpp:240:38: warning: format specifies type 'int' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
v_video.cpp:883:71: warning: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
v_video.cpp:883:80: warning: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
2017-11-26 09:59:28 +02:00
Rachael Alexanderson
34f9f794d4
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-11-25 17:35:24 -05:00
Christoph Oelckers
836970f012
- moved the matrix code out of 'gl' because the model code also needs it.
2017-11-25 13:51:09 +01:00
Magnus Norddahl
7bb92812b8
- Move models into r_data
2017-11-25 13:19:00 +01:00
Magnus Norddahl
679f42db78
- Remove model GL dependencies except for the matrix classes
2017-11-25 13:00:44 +01:00
Magnus Norddahl
b25f191e85
- Move shared model code out of the GL renderer
2017-11-25 12:11:57 +01:00
Rachael Alexanderson
5e29b1c89c
Merge branch 'newtimercode4'
2017-11-24 14:39:58 -05:00
Christoph Oelckers
ed871c3bf8
Merge remote-tracking branch 'remotes/origin/texman_models'
2017-11-24 19:14:08 +01:00
Rachael Alexanderson
f823c6ea3b
Merge ../gzdoom
2017-11-23 22:39:52 -05:00
Rachael Alexanderson
297f00aa4b
- fix model rotation some more
...
- a couple compiler warning fixes
2017-11-23 22:37:07 -05:00
Rachael Alexanderson
1f00810f40
- re-doubled the model rotation code
2017-11-23 21:27:16 -05:00
Rachael Alexanderson
16e6fbf5bf
- commit fix - todo: need to re-double/floatify the model timers again
2017-11-23 21:12:50 -05:00
Rachael Alexanderson
fd5b8cdbf7
Merge remote-tracking branch 'origin/master' into newtimercode4
...
# Conflicts:
# src/gl/models/gl_models.cpp
2017-11-23 21:08:09 -05:00
Magnus Norddahl
f1e7df542f
- Create model renderer abstraction to share more model drawing between renderers
2017-11-24 00:38:52 +01:00
Rachael Alexanderson
2705bdbbdb
Merge branch 'master' of https://github.com/coelckers/gzdoom
2017-11-21 05:28:51 -05:00
Rachael Alexanderson
505da5bf4f
Merge branch 'master' of https://github.com/coelckers/gzdoom into newtimercode4
2017-11-21 05:23:00 -05:00
Rachael Alexanderson
47e9975e90
- fixed a couple of fixes from the previous commit
2017-11-21 05:20:02 -05:00
Rachael Alexanderson
2bc86b52c8
- fixed a few of the more obvious logic errors
2017-11-21 04:06:24 -05:00
Rachael Alexanderson
93dbbb661f
Merge remote-tracking branch 'gzdoom/texman_models'
2017-11-19 11:55:22 -05:00
alexey.lysiuk
cf9a364f71
textures for models
2017-11-19 18:02:14 +02:00
Christoph Oelckers
f0dc619b5b
- fixed bad use of FScanner::GetNumber and GetFloat in code inherited from ZDoomGL.
...
This could lead to bad error messages if some malformed definitions were used.
2017-11-19 15:30:45 +01:00
Rachael Alexanderson
de19efa79d
- trying again: fix shader targets being case sensitive
2017-11-19 04:48:30 -05:00
Rachael Alexanderson
351de94311
- fixed: Accidentally committed in-progress work... again
...
Partial Revert "- fixed: Made shader targets not case sensitive"
This reverts commit 2c24d2e047
2017-11-19 04:46:52 -05:00
Rachael Alexanderson
5c6e62cf6b
Merge remote-tracking branch 'gzdoom/master'
2017-11-19 04:41:48 -05:00
Rachael Alexanderson
2c24d2e047
- fixed: Made shader targets not case sensitive
2017-11-19 04:41:07 -05:00
alexey.lysiuk
c2b4efbea0
Fixed applying of brightmaps to overridden textures
...
https://forum.zdoom.org/viewtopic.php?t=58444
2017-11-18 17:07:42 +02:00
Rachael Alexanderson
cccd19485a
Merge remote-tracking branch 'gzdoom/newtimercode4'
2017-11-15 22:37:19 -05:00
Rachael Alexanderson
909daadd75
- update more millisecond-storing data structures to u/int64_t to fix possible rollover bugs
2017-11-15 20:33:08 -05:00
Christoph Oelckers
16fa0cba21
- fixed comparison.
...
The timer reset must also occur when the values are equal, meaning they got set during the same millisecond.
2017-11-15 18:02:41 +01:00
Rachael Alexanderson
ab32cb4c88
- track level start time for the shader system, reset the shaders.
2017-11-15 11:06:21 -05:00
Rachael Alexanderson
d2bc24737b
- put in timer resets for the shader system, so that they can continue being passed as floats
2017-11-14 22:46:28 -05:00
Rachael Alexanderson
763222b571
- fixed: high uptime was causing overloads in uint32_t and float structures (float losing loss of precision) - this caused any computer online for more than a few days to experience jankiness with internal animations such as rotations and shader timers. Unfortunately, this sounds the death knell for 32-bit platforms, since uint64_t is now required in time-critical structures, which will hurt performance tremendeously, but 64-bit systems will be unaffected.
2017-11-14 16:15:25 -05:00
Rachael Alexanderson
c04b50c41f
Merge branch 'newtimercode' of https://github.com/coelckers/gzdoom
2017-11-12 19:44:12 -05:00
Christoph Oelckers
0323f54384
- rename I_FPSTime function.
...
- now that the frame buffer stores its render time, the 'ms' return from I_GetTimeFrac is not needed anymore, we may just as well use the globally stored value instead.
The only feature this value was ever used for was texture warping.
2017-11-13 00:54:32 +01:00
Christoph Oelckers
2c65f08011
- more timer cleanup
...
* store the frame time in the current screen buffer from where all render code can access it.
* replace some uses of I_MSTime with I_FPSTime, because they should not use a per-frame timer. The only one left is the wipe code but even this doesn't look like it needs either a per-frame timer or a timer counting from the start of the playsim.
2017-11-13 00:28:43 +01:00
Christoph Oelckers
e94109f1c3
- Inside the renderer, use only the time value being passed to RenderView.
...
The voxel rotation code of the software renderer and R_SetupFrame still called I_FPSTime directly.
2017-11-12 23:53:46 +01:00
Christoph Oelckers
f54475b1f1
- I_FPSTime may not return the time at frame start.
...
This is used for real-time profiling and as such needs to return the current time or most of its uses will break.
2017-11-12 23:39:48 +01:00
