Commit Graph

2963 Commits (b0613e334ca7a46e85edcb8a48b499d0cda80ef9)
 

Author SHA1 Message Date
dfighter1985 b0613e334c Removed a now unused file.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 9d3e3a6a73 GL_VERTEX_PROGRAM_TWO_SIDED_ARB isn't used in the GL3 driver.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 7b5aaf7e0f Some cleanup, most of the old OpenGL stuff should be gone.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 5326324b56 Some comments.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 69a4a9f9a5 Two sided rendering, while using dynmat.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 390d1bb156 Don't call newMaterial() every time we load a (sub)material.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 dbd5185de1 Only use the shader combo box for the user shaders.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 586c25f864 When clearing the dynmat, should clear all of them. Also fixes a crash.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 3949c210f6 OpenGL should be fed a clamped color value.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 76204a844d When changing a shader in the editor, reload it in the driver too.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 b775237215 It's now possible to render using the user shaders and dynmat.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 c3c3f154b1 Instead of auto-generating the dynmaterial added a menu item in the material editor that will trigger it if needed.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 8269ec7be5 Wrong direction, wrong lighting!
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 11fe86e552 Forgot to actually pass the direction in the previous commit...
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 72e7d09113 Don't calculate these more than once.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 69c41a31ae These positions and directions were supposed to be in eye coords.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 0453f30582 Added lighting to the specular shader.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 f194704a28 Refactored directional lighting a little. No need to calculate things more than once.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 0ab68ef25f Added point light support.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 9a647a893c Specular shader should compile even when there's no fog added.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 2e4b6bb6ae Don't try to edit stock shaders.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 a9a1d17c4f Added the stock shader names to the material editor, so it will now be able to select them when loading a shape.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 1d71a540ba Apparently QColor::set[color]f takes colors as floats clamped to the [0,1] range.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 c6bb6ec2a9 Renamed a bunch of shader related classes in NL3D to contain the word Usr, since they are user shader related.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 6c58856ed7 Shininess is now loaded from the material as a uniform instead of being hardcoded.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 4ba9d815d4 Colors are now set from the light setup, rather than being hardcoded.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 6f396aa8f7 Added the directional light(s) to the lightmap shader too.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 01ef7fd973 The specular calculation is probably faster this way.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 4ec92d2f06 Simplified the directional light shader generator functions.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 28c4b5b157 Added specular term to the directional lights.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 354d2b8c65 Added ambient term support for directional light.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 43817746ec Renamed light[n]Col to light[n]ColDiff.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 0def5caf54 Added diffuse directional light support to the normal shader.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 3c99323ada Apparently typos and redundantly setting uniforms can totally ruin rendering :D
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 5fbfe7b17f Since now we have fog support, this doesn't need to be disabled anymore.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 8d57eac3d4 Some basic fog.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 c6b714299a Instead of their own bool, store enabled features in the features variable as a flag.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 bbb4762b77 Move shader description generation to it's own method.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 06d7bd9c74 Added alpha test to generated shaders.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 d6558b5b0d Fixed some typos with shader generation.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 37c8b096b1 Added OpenGL3 as a driver option to the configuration tool.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 300cd284d1 Generate samplers for Lightmap shader, based on the number of lightmaps. This fixes the weird display of some lightmapped shapes.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 36a30e83a0 Don't try to render if can't set program up.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 1acccdb5ef Uniform index caching.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 16290f7ff9 Merging default.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 882118612d Moved some constants to uniforms.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 77ae38e452 Added a very primitive shader caching scheme.
--HG--
branch : gsoc2013-dfighter
11 years ago
kervala 0b9092a547 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 11 years ago
kervala 0ccec811d6 Changed: Updated Freetype libraries variable 11 years ago
kervala 11dd2bc101 Changed: Look for Debug versions of libwww libraries 11 years ago