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 |
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
|
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 |
Botanic
|
d0d69d7c77
|
Make it so that bad text always throws a nlwarning
|
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 |
Quitta
|
eba12f770f
|
Merge with default
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
e8db641b47
|
Merge with default
--HG--
branch : quitta-gsoc-2013
|
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 |
Quitta
|
12baee2fcf
|
fix for getting client working + possibly auto login for ingame part
--HG--
branch : quitta-gsoc-2013
|
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 |
kaetemi
|
5ad6373f61
|
Build ligo outside the database
--HG--
branch : build_pipeline_py
|
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 |
dfighter1985
|
ac98c00088
|
The prototype of the material exporter. It's only called when exporting a mesh, for now.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
80bcf2026a
|
If dynamic material already exists, simply just reinitialize it.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
662b75f87a
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
02dc3c1cfe
|
Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs
|
12 years ago |
kaetemi
|
f280f4673f
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
53e11d0d68
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
9f185ce38d
|
Fix an error in 3ds Max with the material script
|
12 years ago |
dfighter1985
|
e99c1e2785
|
Clear the properties when clearing the scene, and also deactivate the buttons and comboboxes of the material widget.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
b776409cc8
|
More material properties are converted now.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
6ad18a88f5
|
Shouldn't reset the material properties, when editing them.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
37fb2cfcda
|
Started work on converting the old material to new one. Some colors are already out. Also made some modifications to the editor so it can deal with it.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
fb3f069a38
|
Should be able to save QColor based QVariant too.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c8147b301c
|
Oups. Wrong copypaste of my own code.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
192e9c058a
|
More work on the Variant type. Also modified material editor to use it.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
a113c81db3
|
Added a Variant type ( for holding variable type values ) to NLMISC
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
9306bd71e6
|
Added GUI code for multi/sub-material.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c2296a2a93
|
It's not a terrible idea to remember the last used directory in the file open dialogs.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
04dcad32e7
|
Added support for adding basic primitives cube, sphere, cylinder, teapot.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
a2ccb7e796
|
The main window takes ownership of ViewPortWidget because of setCentralWidget, so no need to delete it here.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
6d31a50f5d
|
I'll give up, I don't know why wheel events are not passed over to this widget as native events. Fortunately they are not needed, since the Nel style 3d mouse listener doesn't use them.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
42bf13dcfd
|
Implemented shape moving/rotating/zooming. Used parts of Dnk's code from object viewer for setting the camera up properly. NOTE: for some reason the ViewPortWidget doesn't receive native mouse wheel events. An investigation is in order.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
66fb3c1284
|
Shapes can now be loaded and rendered to ViewPortWidget.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
8408ddd552
|
Added ViewPortWidget.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
96eb64ecbe
|
Shader can now be set for the rendering pass, using the shader combo box in MaterialWidget.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
cc86cdd3ef
|
ShaderEditorWidget will now load/save it's content.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c9cd9cdd3c
|
Shaders will now show up in the shader combobox of MaterialWidget.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
1f2ff5721e
|
Shaders are now loaded/saved/deleted from the disk.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Michael Witrant
|
293601e80e
|
Fixed definition tests for optional LibOVR
--HG--
branch : multipass-stereo
|
12 years ago |
Michael Witrant
|
a33a0e5c56
|
LibOVR is optional, and is disabled by default
--HG--
branch : multipass-stereo
|
12 years ago |
Michael Witrant
|
c60bd3e3f5
|
Added LibOVR finder and Linux support, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
00b47d6a50
|
Implemented the Shader widget, more or less.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
128c2a3270
|
Changed the Shader widget a little.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
a57bb57c58
|
Missed these.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
a71e4bc3ed
|
Added some Shader related classes. They are not yet complete.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
eab2386ff6
|
Don't render to texture when in wireframe mode, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
248f07ad9e
|
Put stereo render loop inside ryzom client main loop, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
b1aaf05bf6
|
Init/release VR interfaces in ryzom client, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
352ee42571
|
Distort 2D gui as well, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
6d79a2cf6f
|
Use the color editor for color properties. Also don't crash if property type is not supported by the property browser.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
2e6b1a834f
|
We don't want duplicate property names and labels either.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
9294cdc644
|
We don't want duplicate passes.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
ea06a2c656
|
Property values can now be changed.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
dcd77495ca
|
Fix particles being animated twice in stereo render, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
bf8bd64f0d
|
Add stereo debugger for visually comparing rendered frames, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
9ee24b3b93
|
Property browser will now show the properties.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
e68e7161d8
|
Use width instead of height of screen for hmd fov, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
1fe2b62eb1
|
Add minimal head model and world scale, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
ed267a6587
|
Probably we don't want the default first pass to be stuck with us if we're loading a material.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
fa3ad050de
|
It's not a bad idea to always have at least 1 pass.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
0dd8764e45
|
Make bloom work together with render target used for the rift shader, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
52f4a37939
|
Remove unnecessary user render target code from bloom, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
d96b7e2d66
|
Added a new class, MaterialSpliter, it holds the Material widget, and the Material properties Qt property tree widget, and acts as a proxy / message router for them.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
391fa6dcff
|
Add arbfp1 and fp40 barrel fragment programs, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
c9605dde57
|
Little bit of refactoring.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
73d3176f0c
|
Test arbfp1, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
d13da7a398
|
Prefer NPOT texture over RECT texture
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
832178a83f
|
Adding / Removing properties will now work.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
43f8adff79
|
Render left and right deformed view, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
94fe455a1a
|
Material widget now retrieves the passes when loading a material.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
ce92c13289
|
Test the barrel shader, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
067676c049
|
Changing passes should now show up on the material widget too!
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
c5c6f7c871
|
Render the scene to a target texture for the stereo rendering filter, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
7766116494
|
Fix a render target issue, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
02e61b1e1b
|
Implemented the functionality of the Render Passes widget.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
c5e1235cbb
|
Create stereo render target, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
30f8c9f9e1
|
Added a Nel3D proxy class.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
85109102b2
|
Add interface for stereo display render targets, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
fe91e2a751
|
Cleanup
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
8c35946010
|
Material properties widget is now linked to the right button.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
85e885f274
|
Worked a bit more on dynamic material. Also started to rework the material and pass widgets since I've realized I messed it up. Eg.: passes should have properties, not the material itself.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
26fab0c173
|
Forgot to add these to CMakeLists.txt
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
32071d9053
|
Added skeleton for CDynMaterial. This class will be the new material.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
40c95e82ff
|
Changed the shader editor widget into a dialog. Implemented some of the button functions of Shader widget.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
abbc09e19c
|
Added ShaderWidget, and restructured the material related menu items.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
5f229667bc
|
Create interface classes for stereo displays and head mounted displays, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
1cc5848220
|
Create a clipping frustum, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
e7842982a0
|
Allow multiple user cameras to be calculated separately, useful for sky etc, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
38be9b5997
|
Fix warning
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
202413ab52
|
Adjust 2D interface shift, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
4864ce7a5a
|
Add eye distance in 2D interface shift, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
5423d4d025
|
Add 2D interface shifting calculations, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
39197681fa
|
Correctly adjust text to viewport, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
d1bf069708
|
Add some comments, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
91be2d64bd
|
Cleanup and make bloom work with stereo rendering, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
32a187a199
|
Render from multiple cameras, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
a5c9592165
|
Read sensor data and set camera in snowballs, ref #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
a79b9f7e65
|
Add library name to device name, re #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
64821ab4de
|
List stereo devices, see #43
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
8ded099fbb
|
Added some notes
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
78179ed809
|
Rename some functions to follow the same naming convention of others
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
ad5b60963f
|
Cleanup
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
be33bbc70f
|
Add support for fp40 with opengl
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
f278ac7638
|
Activate textures for postprocessing material under direct3d
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
3e91b1a5cf
|
Test texture with postprocessing material, seems to work with opengl
--HG--
branch : multipass-stereo
|
12 years ago |