Commit Graph

1910 Commits (ed885d3df60986034085af0cc3f8a63db0d4fb21)

Author SHA1 Message Date
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
kaetemi 1a669307da Fix typo 11 years ago
kaetemi ce9e0a397b Fix regression from stereo branch in wind tree 11 years ago
kaetemi 046e3c92da Fix compile error in vertex program 11 years ago
kaetemi 3c099397d8 Update supportVertexProgram calls 11 years ago
kaetemi e99bc7ba69 Remove old interface 11 years ago
kaetemi 256f7ff06c Cleanup unused code 11 years ago
dfighter1985 8d57eac3d4 Some basic fog.
--HG--
branch : gsoc2013-dfighter
11 years ago
kaetemi 6dfc8d0a00 Rename
--HG--
branch : multipass-stereo
11 years ago
kaetemi 973215e1d0 Cleanup
--HG--
branch : multipass-stereo
11 years ago
kaetemi 96dc139ddd Merge with default
--HG--
branch : multipass-stereo
11 years ago
kaetemi df123d6b89 Fix compile errors caused by missing includes 11 years ago
kaetemi d2bc32e598 Merge with default
--HG--
branch : multipass-stereo
11 years ago
kaetemi cd9baf8f89 Cleanup
--HG--
branch : multipass-stereo
11 years ago
kaetemi 74cff50842 Use named indices with wind tree program
--HG--
branch : multipass-stereo
11 years ago
kaetemi c766940e75 Use named indices for per pixel light vertex program
--HG--
branch : multipass-stereo
11 years ago
kaetemi f9c9c1836a Use named uniform indices for lighted vertex program
--HG--
branch : multipass-stereo
11 years ago
kaetemi 61af565bf9 Updated wind tree program container
--HG--
branch : multipass-stereo
11 years ago
kaetemi c353121771 Use lighted vertex program container for per pixel light program
--HG--
branch : multipass-stereo
11 years ago
kaetemi a72f25e763 Add container for lighted vertex program
--HG--
branch : multipass-stereo
12 years ago
kaetemi ab231ea700 Adjust order for meshvp
--HG--
branch : multipass-stereo
12 years ago
kaetemi 278e19743c Do not use old interface here
--HG--
branch : multipass-stereo
12 years ago
kaetemi d5c2a0527d Modify calls in bloom effect
--HG--
branch : multipass-stereo
12 years ago
kaetemi 5e14dc4458 Update veget implementation
--HG--
branch : multipass-stereo
12 years ago
kaetemi 9d93ae51a3 Fixes for d3d
--HG--
branch : multipass-stereo
12 years ago
dfighter1985 c6b714299a Instead of their own bool, store enabled features in the features variable as a flag.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 bbb4762b77 Move shader description generation to it's own method.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 06d7bd9c74 Added alpha test to generated shaders.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d6558b5b0d Fixed some typos with shader generation.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 21a70b4211 Update d3d implementation and add some debugging code
--HG--
branch : multipass-stereo
12 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
12 years ago
kaetemi e8d77e23e0 Rename of a d3d specific class
--HG--
branch : multipass-stereo
12 years ago
kaetemi c6139419ac Partial update of veget vp
--HG--
branch : multipass-stereo
12 years ago
kaetemi 5fbb220795 Update some test code
--HG--
branch : multipass-stereo
12 years ago
kaetemi c53aa6958e Small adjustment to landscape vp parameter setting
--HG--
branch : multipass-stereo
12 years ago
kaetemi 88cbc2f82b Simplify
--HG--
branch : multipass-stereo
12 years ago
kaetemi abafc9b1ef Adjust landscape vertex program to use new interface
--HG--
branch : multipass-stereo
12 years ago
dfighter1985 36a30e83a0 Don't try to render if can't set program up.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 1acccdb5ef Uniform index caching.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 5ad617efb6 Use new program interface for water vertex program
--HG--
branch : multipass-stereo
12 years ago
kaetemi 32809d646a Set driver parameters
--HG--
branch : multipass-stereo
12 years ago
kaetemi 64643e564b Some fixes
--HG--
branch : multipass-stereo
12 years ago
kaetemi 0429e67903 Use CSmartPtr for vertex program
--HG--
branch : multipass-stereo
12 years ago
kaetemi 8f4fe87b7b Set params from storage
--HG--
branch : multipass-stereo
12 years ago
kaetemi 484a946c60 Fix incorrectly removed line
--HG--
branch : multipass-stereo
12 years ago
kaetemi b03895f5f3 Missed file in last commit
--HG--
branch : multipass-stereo
12 years ago
kaetemi e3dead19e4 Replace temporary CMaterial code
--HG--
branch : multipass-stereo
12 years ago
kaetemi e9444ce36a Implement param storage copy
--HG--
branch : multipass-stereo
12 years ago
kaetemi bb625c33bd Flag some TODO's
--HG--
branch : multipass-stereo
12 years ago
kaetemi 87b24bc4ab Add glsl pixel program for stereo distortion
--HG--
branch : multipass-stereo
12 years ago
dfighter1985 16290f7ff9 Merging default.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi ac2e087fbf Cleanup abstract gpu program interface
--HG--
branch : multipass-stereo
12 years ago
kaetemi 0d743d7f37 Implement new driver interface in Direct3D driver
--HG--
branch : multipass-stereo
12 years ago
kaetemi 81876009d3 Implement new driver interface in OpenGL driver
--HG--
branch : multipass-stereo
12 years ago
kaetemi d1b93ac3d6 Expand parameter interface
--HG--
branch : multipass-stereo
12 years ago
dfighter1985 882118612d Moved some constants to uniforms.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 77ae38e452 Added a very primitive shader caching scheme.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi e84e08b0f6 Reduce function duplication
--HG--
branch : multipass-stereo
12 years ago
kaetemi 4d1b5d90c0 Builtin parameter set functions
--HG--
branch : multipass-stereo
12 years ago
kaetemi afe6c16bf3 Separate count and size
--HG--
branch : multipass-stereo
12 years ago
kaetemi 05583d134a Cleanup driver interface
--HG--
branch : multipass-stereo
12 years ago
kervala 0b9092a547 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 12 years ago
kervala 0ccec811d6 Changed: Updated Freetype libraries variable 12 years ago
kervala 87ee7fa8d2 Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 12 years ago
kaetemi 235bfcfd94 Add additional set functions
--HG--
branch : multipass-stereo
12 years ago
kaetemi f0af3326e6 Add gpu program params storage structure
--HG--
branch : multipass-stereo
12 years ago
kaetemi ee0396bd6f Implement new gpu program interface in direct3d driver
--HG--
branch : multipass-stereo
12 years ago
kaetemi 350b580085 Implement new gpu program interface in opengl driver
--HG--
branch : multipass-stereo
12 years ago
kaetemi 1fa02cae9e Make gpu programs use abstract gpu program class
--HG--
branch : multipass-stereo
12 years ago
kaetemi 97c9c26690 Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
12 years ago
kaetemi 361b7eab74 Fix compile error 12 years ago
kervala 89b945bb8c Changed: Minor changes 12 years ago
kervala 86dfd0350b Fixed: Integer 32 bits conversion to 64 bits pointer 12 years ago
kervala d03c795dd8 Changed: Don't use NLMISC includes in NLMISC PCH 12 years ago
kervala ca9597e11e Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style 12 years ago
dfighter1985 931c18cb51 Diffuse texenv should work with the material color, not the diffuse color. Also modulate the texenv result with vertex color if applicable. Also add the shader type as comment in the top of the shader.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 34de0b5569 Removed renderTriangles2 as the normal render loop is used now.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 a1cf2c640b This too.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 35429fea43 Oups forgot this when changing the rendering loop.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 7307d748ea Sometimes shapes have 0 materials?!
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 14aea7acc9 Removed the debug triangle from the material editor plugin.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 eabc209303 Render from the normal loops.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 888812e72d Only validate the shader program after it's set up. Avoids false alarm.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 5bc7ecf799 Specular shader is now on GLSL.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 86482ed82f Fixed some shader compile errors.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ed23ec247d Render lightmaps with GLSL.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 0ab6322955 More fixed functionality pipeline disabled with conditional build.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 997a231bff Conditionally build some deprecated functions. Also little adjustment to the shader texenv generator.
--HG--
branch : gsoc2013-dfighter
12 years ago