SamuelCho
2dc097ecb6
Return interface materials to use the standard blending selection function. Make sure we set the appropriate alpha for interface materials depending on if we're additive or alpha blended.
2016-12-22 23:15:43 -08:00
asarium
5e23c5d5e1
Fix Visual Studio 2015 compiler bug
2016-12-14 20:11:43 +01:00
asarium
4cf8a32c1e
Fix braces warning
2016-12-14 11:24:51 +01:00
asarium
3f7728d328
Fix member initialization order of model_material
...
Since there are so many member I decided it would be better to use the
new member assignment syntax since that automatically guarantees the
right initialization order.
2016-12-14 11:06:15 +01:00
SamuelCho
5a25de0885
Removed extra brace from the ambient map fix attempt.
2016-10-12 01:56:40 -07:00
SamuelCho
4c4d5c2310
Fixed reflectance maps not being used if no shine map isn't available. Fixed ambient/cavity maps not being used.
2016-10-11 23:42:46 -07:00
asarium
03591b33ce
Always use alpha blending for interface materials
2016-09-10 14:22:40 +02:00
m!m
61091ad95a
Merge pull request #923 from SamuelCho/shader_material_handling
...
Refactored material handling of shaders
2016-09-01 11:36:47 +02:00
SamuelCho
fef0e7e1f8
Specular unlit rendering.
2016-08-31 01:32:12 -07:00
SamuelCho
b754fa56b9
Simplified material/shader handling.
2016-08-31 00:45:15 -07:00
SamuelCho
17bd4a2fa8
Reconciled shield changes with recent changes.
2016-08-30 20:36:08 -07:00
SamuelCho
bb78e74646
Improved shields. Added shield decal rendering technique. Fixed inaccurate shield normals and shield collision detection timing. Bumped up shield impacts count to 200.
2016-08-28 15:36:10 -07:00
SamuelCho
f693413e26
Removed orphaned GL_state code.
2016-08-28 14:24:10 -07:00
asarium
beb9288c73
Merge branch 'opengl_core_materials' of https://github.com/SamuelCho/fs2open.github.com into ogl_core/merge
...
Conflicts:
code/graphics/gropengl.cpp
code/io/cursor.cpp
freespace2/SDLGraphicsOperations.cpp
2016-08-23 16:05:28 +02:00
SamuelCho
75ae6ba4db
Removed experimental uniform handling code.
2016-08-20 21:31:43 -07:00
SamuelCho
08793c9231
Removed shadowed variable references from the materials code. Removed vestigal OpenGL vertex component code.
2016-08-20 20:52:17 -07:00
SamuelCho
a481999a24
OpenGL Core support. Introduction of material based draw system. Rewrote geometry batcher.
2016-08-17 00:13:19 -07:00
SamuelCho