Commit Graph

3109 Commits (a119d3e1a0bf8e065af606f3240eb19f30ad8939)

Author SHA1 Message Date
dfighter1985 cf6d2a88bc Removed some now unused methods.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 afb56ea660 Moved the rendering methods into a new file.
--HG--
branch : gsoc2013-dfighter
11 years ago
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
Cédric OCHS f8f25e8579 Merged in nimetu/ryzomcore (pull request #26)
Fixed: map landmark bug (issue #15)
11 years ago
dfighter1985 7b5aaf7e0f Some cleanup, most of the old OpenGL stuff should be gone.
--HG--
branch : gsoc2013-dfighter
11 years ago
kervala c8c296f484 Changed: Created NELID macro to fix warning "multi-character character constant" 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
Nimetu 75d784c656 Fixed: map landmark bug (issue #15) 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
kervala bb7297f260 Fixed: Wrong variable used to compute array length 11 years ago
kervala b7ddc2c0d2 Fixed: OpenGL ES driver compilation 11 years ago
kervala 82904232d2 Fixed: Warnings with GCC 11 years ago
kervala 61a5647bdd Changed: Typo 11 years ago
kervala 6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 11 years ago
kervala c7deb1b0c4 Changed: FIX_PRECOMPILED_HEADER now useless 11 years ago
kervala 6dff896bba Changed: Link to CURL_LIBRARIES 11 years ago
kervala 0ff9908e8e Changed: Don't include files from project in PCH 11 years ago
kervala 3294955c60 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 11 years ago
StudioEtrange d81c9db04e FindMSVC fix 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
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
11 years ago
kaetemi ab231ea700 Adjust order for meshvp
--HG--
branch : multipass-stereo
11 years ago
kaetemi 278e19743c Do not use old interface here
--HG--
branch : multipass-stereo
11 years ago
kaetemi d5c2a0527d Modify calls in bloom effect
--HG--
branch : multipass-stereo
11 years ago
kaetemi 5e14dc4458 Update veget implementation
--HG--
branch : multipass-stereo
11 years ago
kaetemi 9d93ae51a3 Fixes for d3d
--HG--
branch : multipass-stereo
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
kaetemi 21a70b4211 Update d3d implementation and add some debugging code
--HG--
branch : multipass-stereo
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
kaetemi e8d77e23e0 Rename of a d3d specific class
--HG--
branch : multipass-stereo
11 years ago
kaetemi c6139419ac Partial update of veget vp
--HG--
branch : multipass-stereo
11 years ago
kaetemi 0a9dfc6aef Update decal vp
--HG--
branch : multipass-stereo
11 years ago
kaetemi 5fbb220795 Update some test code
--HG--
branch : multipass-stereo
11 years ago
kaetemi c53aa6958e Small adjustment to landscape vp parameter setting
--HG--
branch : multipass-stereo
11 years ago
kaetemi 88cbc2f82b Simplify
--HG--
branch : multipass-stereo
11 years ago
kaetemi abafc9b1ef Adjust landscape vertex program to use new interface
--HG--
branch : multipass-stereo
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
kaetemi 5ad617efb6 Use new program interface for water vertex program
--HG--
branch : multipass-stereo
11 years ago
kaetemi 32809d646a Set driver parameters
--HG--
branch : multipass-stereo
11 years ago
kaetemi 64643e564b Some fixes
--HG--
branch : multipass-stereo
11 years ago
kaetemi 0429e67903 Use CSmartPtr for vertex program
--HG--
branch : multipass-stereo
11 years ago
kaetemi 8f4fe87b7b Set params from storage
--HG--
branch : multipass-stereo
11 years ago
kaetemi 484a946c60 Fix incorrectly removed line
--HG--
branch : multipass-stereo
11 years ago
kaetemi b03895f5f3 Missed file in last commit
--HG--
branch : multipass-stereo
11 years ago
kaetemi e3dead19e4 Replace temporary CMaterial code
--HG--
branch : multipass-stereo
11 years ago
kaetemi e9444ce36a Implement param storage copy
--HG--
branch : multipass-stereo
11 years ago
kaetemi bb625c33bd Flag some TODO's
--HG--
branch : multipass-stereo
11 years ago