Commit Graph

1918 Commits (9c69e1bf84a673fe43b6a475bbb53cdc0d741d2b)

Author SHA1 Message Date
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 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 87ee7fa8d2 Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt 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 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
kaetemi 97c9c26690 Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
11 years ago
kaetemi 361b7eab74 Fix compile error 11 years ago
kervala 89b945bb8c Changed: Minor changes 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
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
12 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
dfighter1985 c7e8ebcf05 Added some more GLSL related calls.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 50bb8c5d60 Made some GLSL related OpenGL functions available.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 10aad932db Removed checks for ARB fragment shader, as it's part of OpenGL as of 3.0+, also fragment shaders cannot be disabled as of the same version.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 dd0a691fb8 This also belongs there.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 90595b5bb6 Removed NV Texture env combine stuff.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 3aae79c38b Removed NV Texture Shader related stuff.
--HG--
branch : gsoc2013-dfighter
12 years ago
kervala 2c7f848c83 Changed: Tabulations to spaces 12 years ago
dfighter1985 6fba0c094a Merging default
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c90f51afbe Look for OpenGL 3.3 not 1.2 on startup.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 82d29b3e23 In OpenGL 3+ we cannot disable HW VBO since it's mandatory, also Vertex Programs are mandatory too, so they must be abailable. No need to check for them!
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 a81db21e0a Removed lots of EXT Vertex Shader related code.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 932f2bdd27 Removed lots of Nvidia shader related code.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 71cdf88b81 Fix warning
--HG--
branch : multipass-stereo
12 years ago
dfighter1985 f925666d83 Manage the texture matrices too.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 b1777ff546 Projection matrix is now generated and managed by Nel and only loaded into OpenGL when dirty.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f34f4d10d3 While I'm at it, I've renamed the VBO parameters too for the same reason.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 15b4be874e Removed the ARB keyword from the VBO managing GL functions, as they are part of the core specification as of OpenGL 3.3
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 31451aa0f6 Removed the ARB word from the names of CVertexArrayRangeARB and CVertexBufferHardARB.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 cfc4565b5d Removed more stuff that's no longer neccessary now that we only work with VBO.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 96b2df8405 Merge with default
--HG--
branch : multipass-stereo
12 years ago
kaetemi 53bebec880 Add some basic prediction to CCDBNodeBranch::find
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 3bc5d88d78 Force link 12 years ago
dfighter1985 6360302a2b Use VBO only.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 bb6195f858 Always prefer VBOs as OpenGL core requires the use of VBOs.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ee2c14670e It's a good idea to actually use the VBO if we spent this time cleaning up the implementations :D
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 44188b58b7 We only have 1 kind of HW VBO left.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 0d98540f2e Ryzom checks for 0 allocated AGP/Video RAM, so lie max. here instead of saying 0.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 adab29e5a6 There's no need for *this* dummy VB either.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 5e69d558ec Since we use HW VBO, we don't need to actually check for it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 b444f69db3 VertexArrayRange allocation thing is pointless when using ARB VBOs since, the driver takes care about allocating to either system RAM or video RAM.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 e41a15ae30 Allow Ryzom client to use the new driver.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d06f675c08 Removed more of the vendor specific VBO stuff ( function definitions for example )
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 28c49a0427 These friends and the function are now pointless.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 5c7540d85e Removed vendor specific VBO code.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 8f45e49fa0 GL3 driver can now be instantiated.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 7f0ae42a40 Finally finished cleaning the OpenGL ES stuff.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 1c3fbf0256 Improve performance of UsedTexture debugging info in OpenGL driver
--HG--
branch : kaetemi-optimize
12 years ago
dfighter1985 e44b663bdb Even more OpenGL ES cleanup.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 2b5eddbe95 More OpenGL ES cleanup.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 64335ae0b8 NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked 12 years ago
kaetemi 5a9537dfcc Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 7bb8dec40c Parse action handler condition for interface link in advance
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi d5308215aa Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager
--HG--
branch : kaetemi-optimize
12 years ago
dfighter1985 879f2f3a85 More GLES stuff removed.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 40da205b59 Removed some GLES related code.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi f6ee2707ea Merge with default
--HG--
branch : multipass-stereo
12 years ago
dfighter1985 296083ba61 First batch of renames.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d5e5775f29 "Forked" the OpenGL driver.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 dddd531249 Moved back the unix event emitter to the OpenGL driver. It was a bad idea to move it out ( this way ) originally.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 1c0d74fc00 Unix build fixes.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 78595ec0e6 Silently sneaking in a nicer splash image for ovqt 12 years ago
dfighter1985 dcf3ba2785 Move unix event emitter out of the driver, to NL3D.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 1e9771d054 Merge with default
--HG--
branch : multipass-stereo
12 years ago
kaetemi e435a07bb6 Fix bug #45 crash in zone lighter with large number of CPU cores 12 years ago
kaetemi e9c274c135 Use tags for pacs prim export 12 years ago
kervala aeddda3e19 Fixed: lua_open() doesn't exist with Lua 5.2 12 years ago
kervala 296b4384a8 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 12 years ago
dfighter1985 0c64261e22 The 3dsmax exporter will now use the material file specified in the Nel material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f94960dffe Added the Nel material file selection possibility to the Nel material 3dsmax startup script.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 3ff8613205 Merging default.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 7a9ae41fd5 Missing a letter e here
--HG--
branch : gsoc2013-dfighter
12 years ago