Commit Graph

3110 Commits (9c69e1bf84a673fe43b6a475bbb53cdc0d741d2b)

Author SHA1 Message Date
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
kaetemi 87b24bc4ab Add glsl pixel program for stereo distortion
--HG--
branch : multipass-stereo
11 years ago
dfighter1985 16290f7ff9 Merging default.
--HG--
branch : gsoc2013-dfighter
11 years ago
kaetemi ac2e087fbf Cleanup abstract gpu program interface
--HG--
branch : multipass-stereo
11 years ago
kaetemi 0d743d7f37 Implement new driver interface in Direct3D driver
--HG--
branch : multipass-stereo
11 years ago
kaetemi 81876009d3 Implement new driver interface in OpenGL driver
--HG--
branch : multipass-stereo
11 years ago
kaetemi d1b93ac3d6 Expand parameter interface
--HG--
branch : multipass-stereo
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
kaetemi e84e08b0f6 Reduce function duplication
--HG--
branch : multipass-stereo
11 years ago
kaetemi 4d1b5d90c0 Builtin parameter set functions
--HG--
branch : multipass-stereo
11 years ago
kaetemi afe6c16bf3 Separate count and size
--HG--
branch : multipass-stereo
11 years ago
kaetemi 05583d134a Cleanup driver interface
--HG--
branch : multipass-stereo
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
kervala 87ee7fa8d2 Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 11 years ago
kervala 17ebe78cf6 Changed: Look for Debug version of freetype and use it for Debug configuration 11 years ago
kaetemi 235bfcfd94 Add additional set functions
--HG--
branch : multipass-stereo
11 years ago
kaetemi f0af3326e6 Add gpu program params storage structure
--HG--
branch : multipass-stereo
11 years ago
kaetemi ee0396bd6f Implement new gpu program interface in direct3d driver
--HG--
branch : multipass-stereo
11 years ago
kaetemi 0a3f3f1760 Merge with default
--HG--
branch : multipass-stereo
11 years ago
kaetemi 350b580085 Implement new gpu program interface in opengl driver
--HG--
branch : multipass-stereo
11 years ago
kaetemi 1fa02cae9e Make gpu programs use abstract gpu program class
--HG--
branch : multipass-stereo
11 years ago
StudioEtrange 3121a83730 Merged ryzom/ryzomcore into default 11 years ago
kaetemi 97c9c26690 Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
11 years ago
kervala 9dccf31863 Removed: S3TC module because not used anymore 11 years ago
kaetemi 361b7eab74 Fix compile error 11 years ago
kaetemi 348594e5fd Merge 11 years ago
kaetemi 68f20a3369 Use distSqTo instead of distTo 11 years ago
kaetemi 082ce825a5 Add distSqTo to CAIVector 11 years ago
kaetemi 9e1ca3d1d0 Comment if-check around commented unused client-side speed limiting code 11 years ago
kaetemi e99bf91b20 Move r2 plot item security off the AIS to the EGS and remove hardcoded sheet ids 11 years ago
StudioEtrange fec561914d Merged ryzom/ryzomcore into default 11 years ago
kervala 89b945bb8c Changed: Minor changes 11 years ago
kervala 980b7120c8 Changed: Merged code from official client 11 years ago
kervala 3c37af1bbc Fixed: Define math.fmod as a function for Lua 5.0 11 years ago
kervala 86dfd0350b Fixed: Integer 32 bits conversion to 64 bits pointer 11 years ago
kervala d03c795dd8 Changed: Don't use NLMISC includes in NLMISC PCH 11 years ago
kervala ca9597e11e Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style 11 years ago
kervala 37fa1fa1ec Fixed: Use 32 bits libraries from Windows SDK in 64 bits 11 years ago
kervala a62b5068f7 Changed: Replace atoi by NLMISC::fromString 11 years ago
kervala d196f05b7e Removed: DInput module because it's not used anymore 11 years ago
StudioEtrange d2530f6894 Merged ryzom/ryzomcore into default 11 years ago
kervala f2bc8f3c8c Added: Toolchains for Android and iOS 11 years ago
kervala 3988120c55 Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION
Changed: Look for all installed Windows SDKs
11 years ago
kervala 6ddf4786ff Changed: Use /X everytime with MSVC 11 years ago
kervala 3a7cee4aa7 Changed: Improved MFC module 11 years ago
kervala 4a4b9b5ab8 Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH 11 years ago
kervala 651065e4ed Added: MSVC module to use later 11 years ago
kervala a71f08274e Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS 11 years ago
kervala 969d9a057d Changed: Display a message when compiling with NMake and define NMAKE 11 years ago
kervala a52df4c710 Changed: Factorized AMD/amd 11 years ago
kervala 26679e767e Changed: Allow to put a "revision" file in root directory if .hg directory is not present 11 years ago
kervala 3e4a567d6a Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases) 11 years ago
StudioEtrange f10b6613cf ** PCH Support for NMake with VS2012
NMAKE-VS2012 Error LNK2011
while NMAKE-VS2010 does not complain
we need to link the pch.obj file
see http://msdn.microsoft.com/en-us/library/3ay26wa2(v=vs.110).aspx

** PCH Support for Ninja
Ninja need to add property
        OBJECT_DEPENDS for using PCH
        OBJECT_OUTPUTS for create PCH
see http://public.kitware.com/pipermail/cmake-developers/2012-March/003653.html
11 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
11 years ago
dfighter1985 34de0b5569 Removed renderTriangles2 as the normal render loop is used now.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 a1cf2c640b This too.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 35429fea43 Oups forgot this when changing the rendering loop.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 7307d748ea Sometimes shapes have 0 materials?!
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 14aea7acc9 Removed the debug triangle from the material editor plugin.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 eabc209303 Render from the normal loops.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 888812e72d Only validate the shader program after it's set up. Avoids false alarm.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 5bc7ecf799 Specular shader is now on GLSL.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 86482ed82f Fixed some shader compile errors.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 ed23ec247d Render lightmaps with GLSL.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 0ab6322955 More fixed functionality pipeline disabled with conditional build.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 997a231bff Conditionally build some deprecated functions. Also little adjustment to the shader texenv generator.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 c74e279282 Some settings for the normal shaded material.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 e740fd4aeb Don't crash when releasing.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 d67640dab6 Render with GLSL. Long way to go.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 169ee413df Redundant cloud shader code.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 f77bcf6981 Generate cloud shader.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 2c84b164ee Water shader generation.
--HG--
branch : gsoc2013-dfighter
11 years ago
Thibaut Girka ea8a845ab9 Add support for LibVR
--HG--
branch : multipass-stereo
11 years ago
kaetemi 7782576dfc Merge with default
--HG--
branch : multipass-stereo
11 years ago
kervala 6d10e3189c Changed: Formatting 12 years ago
kervala 881912fa34 Fixed: Crash when trying to display a missing texture 12 years ago
dfighter1985 750e7b5e8e A little explanation after I successfully decyphered this.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d64dd4f23f Generate shader for per-pixel without specular.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 6b3b8855ee Generate Per-Pixel Lighting shader.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 2ca79259ce More work on specular shader generation. Hopefully now it's right.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 1414f4d3c1 Little bit of refactoring.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 12df2fd71c Generate specular shader.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 69cc5e48ed Lightmap shader generator.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f6737c8aa4 UserColor shader should use the normal generator.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 4f8ac17529 Implemented the mapping of TexEnv calls to GLSL. More or less.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c49265b9db The stringstream used is now part of the generator class.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 7384cdd10a Added offset enum.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 0dcb470a19 Generate the pixel shader ins too.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 46363f1909 Started working on the shader generator.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d67198580a Implemented uniform querying, setting. Also updated the test triangle.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 3ca6a98aec Made the triangle debug program a bit more complicated, now using interpolated color.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9dc91a6ed1 Abstract program objects, vertex, and pixel programs can now be created using the driver, so the user can now feed shaders to it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 41e84066fb Better store vertex and pixel programs separately so we can detach them if needed.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f5358f712c Rendering the debug triangle with GLSL now works.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 b3ea9ee787 Implemented shader and program object classes.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ed5741addd Added stubs for GLSL program classes.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f387256984 Added triangle drawing for debug purposes.
--HG--
branch : gsoc2013-dfighter
12 years ago