4913e7dc94
GL3: Primary and secondary color vertex attributes
...
--HG--
branch : opengl3
11 years ago
4b4ac31a3d
Remove branch unrelated features (must backout this changeset after merging into parent feature branch)
...
--HG--
branch : opengl3
11 years ago
267e7397c5
GL3: Support specular materials with missing textures
...
--HG--
branch : opengl3
11 years ago
cfe1b2b8da
GL3: Don't call virtual getters for accessing internal data, please
...
--HG--
branch : opengl3
11 years ago
6d946081e3
GL3: Fix typo
...
--HG--
branch : opengl3
11 years ago
25cb297dcf
GL3: Fix for texture formats
...
--HG--
branch : opengl3
11 years ago
d415ff508e
Backed out changeset: 96647f9b388a
...
--HG--
branch : opengl3
11 years ago
725ec35188
GL3: Use core profile texture formats
...
--HG--
branch : opengl3
11 years ago
d421f34c1a
GL3: Remove dead code
...
--HG--
branch : opengl3
11 years ago
9cf5b3305c
GL3: Create 3.3 core profile context
...
--HG--
branch : opengl3
11 years ago
11e871c8ab
GL3: Remove dead code
...
--HG--
branch : opengl3
11 years ago
a17fc28955
GL3: Cleanup
...
--HG--
branch : opengl3
11 years ago
f7d0b292f7
GL3: Cleanup
...
--HG--
branch : opengl3
11 years ago
75d2bf91bf
GL3: Even more refactoring
...
--HG--
branch : opengl3
11 years ago
17b3fa7b55
GL3: More refactoring
...
--HG--
branch : opengl3
11 years ago
5002eea62a
GL3: Further refactor
...
--HG--
branch : opengl3
11 years ago
a13d39e9f4
GL3: Begin refactoring pixel program
...
--HG--
branch : opengl3
11 years ago
5ed5cd5ea8
Add interface for HMD with player death support
11 years ago
270342a07d
GL3: Specular related
...
--HG--
branch : opengl3
11 years ago
2aa36f413d
GL3: Prepare TexGen implementation
...
--HG--
branch : opengl3
11 years ago
8532f79833
GL3: Remove dead code
...
--HG--
branch : opengl3
11 years ago
62381dd219
GL3: Cleanup dead code
...
--HG--
branch : opengl3
11 years ago
1a40e67fee
GL3: Remove dead code
...
--HG--
branch : opengl3
11 years ago
11dc9110c2
GL3: Remove dead code
...
--HG--
branch : opengl3
11 years ago
c0bb40b4a5
GL3: Fix tex coord (fixes landscape near rendering)
...
--HG--
branch : opengl3
11 years ago
c270ec5a58
GL3: Remove dead code
...
--HG--
branch : opengl3
11 years ago
12cb0ac306
GL3: Fix
...
--HG--
branch : opengl3
11 years ago
78ec40afa7
GL3: Rewrite generateTexEnv
...
--HG--
branch : opengl3
11 years ago
f62228592e
GL3: Cleanup samplers
...
--HG--
branch : opengl3
11 years ago
7691e22a28
GL3: Fix ambient
...
--HG--
branch : opengl3
11 years ago
75e650432f
GL3: Cleanup and fix lighting state bug in pp
...
--HG--
branch : opengl3
11 years ago
d5d82ce900
GL3: Fix
...
--HG--
branch : opengl3
11 years ago
443eb54128
GL3: Note
...
--HG--
branch : opengl3
11 years ago
21eca5af5f
GL3: Optimize
...
--HG--
branch : opengl3
11 years ago
424aa079a2
GL3: Cleanup
...
--HG--
branch : opengl3
11 years ago
b25747b2ef
GL3: Optimize VP switching
...
--HG--
branch : opengl3
11 years ago
5d80073c0f
GL3: Refactoring vertex program generation
...
--HG--
branch : opengl3
11 years ago
7a960ed768
GL3: Cleanup user program state
...
--HG--
branch : opengl3
11 years ago
3885389b3b
GL3: Remove GL_LIGHTING
...
--HG--
branch : opengl3
11 years ago
641125963e
GL3: Replace glActiveTexture
...
--HG--
branch : opengl3
11 years ago
7ae15eb2b8
GL3: Remove ARB_multitexture
...
--HG--
branch : opengl3
11 years ago
89c83f86e5
GL3: Remove GL_EXT_blend_color and GL_EXT_secondary_color
...
--HG--
branch : opengl3
11 years ago
4fe91132ce
GL3: Remove GL_ARB_multisample
...
--HG--
branch : opengl3
11 years ago
5ad62b942a
GL3: Remove GL_MAX_TEXTURE_UNITS_ARB
...
--HG--
branch : opengl3
11 years ago
9c1165dcf9
GL3: Remove GL_MAX_LIGHTS
...
--HG--
branch : opengl3
11 years ago
8a60e5d4fa
GL3: Remove checkForPerPixelLightingSupport
...
--HG--
branch : opengl3
11 years ago
313de47e53
GL3: Remove GL_ARB_texture_rectangle
...
--HG--
branch : opengl3
11 years ago
0802330985
GL3: Remove GL_ARB_texture_cube_map
...
--HG--
branch : opengl3
11 years ago
441d3a66f5
GL3: Remove GL_EXT_separate_specular_color
...
--HG--
branch : opengl3
11 years ago
fce7aab22c
GL3: Remove GL_EXT_vertex_weighting
...
--HG--
branch : opengl3
11 years ago
d7c5d30523
GL3: Remove GL_ARB_texture_non_power_of_two
...
--HG--
branch : opengl3
11 years ago
79141e0a9c
GL3: Remove GL_ARB_texture_compression
...
--HG--
branch : opengl3
11 years ago
3c1b39e103
GL3: Remove unused variable
...
--HG--
branch : opengl3
11 years ago
3bba0fad6c
GL3: Remove GL_EXT_framebuffer_object
...
--HG--
branch : opengl3
11 years ago
40a6972753
GL3: Remove GL_ATI_texture_env_combine3 and GL_ATIX_texture_env_route
...
--HG--
branch : opengl3
11 years ago
118d6e0966
GL3: Remove GL_NV_occlusion_query
...
--HG--
branch : opengl3
11 years ago
2139f39c43
GL3: Remove GL_EXT_texture_env_combine
...
--HG--
branch : opengl3
11 years ago
b978ec5c8e
Cleanup extensions
...
--HG--
branch : opengl3
11 years ago
b12c15ab5d
Follow existing code style
...
--HG--
branch : opengl3
11 years ago
99f37eb90c
Cleanup style
...
--HG--
branch : opengl3
11 years ago
be050f3927
Cleanup
...
--HG--
branch : opengl3
11 years ago
8f6c32bd69
Backed out changeset: 3937923211ec
...
--HG--
branch : compatibility
11 years ago
e01a42e21f
Fix shader compile
...
--HG--
branch : opengl3
11 years ago
082504bc70
Workaround for shader bug
...
--HG--
branch : opengl3
11 years ago
444d652435
More logging
...
--HG--
branch : opengl3
11 years ago
41f77780d5
Functions texture2D and textureCube are deprecated
...
--HG--
branch : opengl3
11 years ago
870df89bcd
Remove unnecessary assert
...
--HG--
branch : opengl3
11 years ago
df1e27b82c
Fix shader compile on nv driver
...
--HG--
branch : opengl3
11 years ago
cc32c24f23
Revert branch unrelated change
...
--HG--
branch : opengl3
11 years ago
d7a0816547
Merge with default
...
--HG--
branch : opengl3
11 years ago
3738aa71ce
Fix EOL
...
--HG--
branch : opengl3
11 years ago
c83afd649d
Changed: Replaced some Mac OS X warnings by TODO comments
...
--HG--
branch : compatibility
11 years ago
62eb6347e5
Changed: Aligned methods names
11 years ago
8968124553
Changed: Aligned methods names
...
--HG--
branch : compatibility
11 years ago
81881a583f
Fixed: Switch not handled warnings
...
--HG--
branch : compatibility
11 years ago
bfaf952f32
Fixed: Warnings with clang: wrong ! and == operators order
11 years ago
8fa24eeb4e
Fixed: Warnings with clang: wrong ! and == operators order
...
--HG--
branch : compatibility
11 years ago
a0801ebffe
Changed: Removed useless definitions
11 years ago
7ab7952dbd
Changed: Removed useless definitions
...
--HG--
branch : compatibility
11 years ago
def5243d06
Changed: Updated OpenGL headers
11 years ago
ee87716aa0
Changed: Updated OpenGL headers
...
--HG--
branch : compatibility
11 years ago
a77bddf265
Changed: Give priority to ARB extensions in tests
...
--HG--
branch : compatibility
11 years ago
55a29115ba
Changed: Detect available video memory with OpenGL extensions
11 years ago
d4fb36d1eb
Changed: Detect available video memory with OpenGL extensions
...
--HG--
branch : compatibility
11 years ago
0aaad7051b
Changed: Use OpenGL ES functions prototypes from official headers
11 years ago
3e30929867
Changed: Use OpenGL ES functions prototypes from official headers
...
--HG--
branch : compatibility
11 years ago
c59f9d8a5e
Changed: Optimize OpenGL driver PCH
11 years ago
406df1c59c
Changed: Optimize OpenGL driver PCH
...
--HG--
branch : compatibility
11 years ago
927ff14998
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
11 years ago
713c07e1e6
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
--HG--
branch : compatibility
11 years ago
2076a6b13d
Changed: Typo
11 years ago
2f19b88539
Fix crash in 0_setup.py on Linux
11 years ago
de9724a821
Add color to console output
11 years ago
b3cf16f263
Separate output directories from input directories
11 years ago
2ca40f10eb
Merging default.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
681a0bc8f3
Don't generate and cache shaders if they are set up from outside of the driver.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
43ad0189c6
Set up the shader programs in setupMaterial call.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
709c54e485
Fixed a GLSL syntax bug that I introduced into the shader generator in December. Specular material will now longer disappear.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
fc835cbe6c
Merged in StudioEtrange/ryzomcore/ovqt-fixes (pull request #54 )
...
OVQT Plugins - CMake Install fixes
11 years ago
020bfb775e
Disable build of dataset packed sheets in build pipeline
11 years ago
72fac9aaf1
Update default directories
11 years ago
934f5c3f0b
Add script for creating a new shard patch
11 years ago
27da0870b2
Rename scripts
11 years ago
e8770db674
Nicer batch scripts for pipeline
11 years ago
b52230832e
Add build process script for shard sheets
11 years ago
76ce7523ff
Additional streaming behaviour fix for XAudio2 driver
11 years ago
49fa568123
Remove some debug
11 years ago
d680b70308
Fix some streaming behaviour in XAudio2 driver
11 years ago
0b8db2399c
CMAKE TARGET : SHARED and MODULE
...
About Shared Library (shared) and Module Library (module) type of cmake target
INSTALL command has different behaviour for ARCHIVE LIBRARY RUNTIME depending on the platform
11 years ago
6426393210
Additional streaming behaviour fix for XAudio2 driver
...
--HG--
branch : compatibility
11 years ago
f703359eaa
Remove some debug
...
--HG--
branch : compatibility
11 years ago
17b99ba796
Fix some streaming behaviour in XAudio2 driver
...
--HG--
branch : compatibility
11 years ago
c26e4c7426
Changed: Typo
...
--HG--
branch : compatibility
11 years ago
5c4175a54d
Only copy if needed
11 years ago
74363fdb33
Merge
11 years ago
e569541faa
Fix default directory
11 years ago
497232b470
Extend shard data script to gather executables and configurations
11 years ago
3267b89362
Add directories for patchman to gamedata setup
11 years ago
9939219ebf
Extend shard data script
11 years ago
2e1b47e3f0
Backed out merge changeset: b2d97621fa3b
...
Backed out merge revision to its first parent (99840e8413f2)
11 years ago
6b04b77bdd
Fixed: Reverted i18n change
...
--HG--
branch : compatibility
11 years ago
f4dda130a6
Clean translation diffs from OLDVALUE comments before merge, issue #116 , patch provided by Łukasz K
11 years ago
4df290147b
Fix make_merge_wk for uxt
11 years ago
b1c485fde0
Cleanup
11 years ago
451a82e59e
Cleanup
11 years ago
ccf99f4f8e
Merge
11 years ago
4f2a1b7db2
Fix the bug that caused the shape exporter to crash
11 years ago
90c9028170
Cleanup
11 years ago
ada9e8da5d
Fix export of NeL Flare
11 years ago
3f04907c31
Merged in botanic/ryzomcore-botanic-testing (pull request #21 )
...
Make it so that bad text always throws a nlwarning
11 years ago
bd206db383
Remove pacs.packed_prims when done
11 years ago
9d5c9019b5
Move visual slot tab to separate directory
11 years ago
13e3849c89
Fix typo
11 years ago
6ac551cf60
Implement skip for rbank process
11 years ago
f085e226c6
Implement skip for ig elevation
11 years ago
bd335d80c4
Implement skip for zone dependency process
11 years ago
3d2c60aac6
Get properties search paths from python variable
11 years ago
af65ca5c62
Fix lightmap optimize skip
11 years ago
38e353b5c6
Implement skip for coarse mesh build process
11 years ago
a0f86ebd39
Implement skip for shape lightmap optimize build process
11 years ago
01a115899b
Implement skip for interface build process
11 years ago
3f492d8b20
Add script to automatically merge translation wk files
11 years ago
6371fc324d
Add script to make and merge all translation diffs
11 years ago
6b19d30de0
Add short translation procedure readme
11 years ago
8dac3b82f3
Merge
11 years ago
74984f768a
Improve leveldesign_dev.bat
11 years ago
e728daa7cd
Add CMAKE option and NVIDIA PerfHUD support
11 years ago
972d26ddde
Adjust default paths
11 years ago
b785192a5e
Add clause translation tool scripts
11 years ago
762a3b2655
Add translation tool scripts
11 years ago
62a4bec18c
Add translation directory to pipeline setup
11 years ago
50f0ebbb41
Copy refs in client install
11 years ago
ef03dcd294
Add refs to patch xml
11 years ago
9c9811f1b3
Reorder pipeline scripts
11 years ago
7736c5757c
Add world edit data install directory to pipeline setup
11 years ago
f3b6ab7052
Typo
11 years ago
0d0907aa08
Add build shadow skin to shape process
11 years ago
3fa19d91a5
Generate correct client.cfg data path for dev client
11 years ago
2619033972
Replace shard install script
11 years ago
680dfbd738
Remove duplicate tool
...
--HG--
branch : build_pipeline_py
11 years ago
40fe633dbe
Fix thread lockup in zone lighter
...
--HG--
branch : build_pipeline_py
11 years ago
5144770d9d
Backed out changeset: de1de16eef3b
...
--HG--
branch : build_pipeline_py
11 years ago
7219073bdc
Include world editor files directory in prim export
...
--HG--
branch : build_pipeline_py
11 years ago
1a0ee41780
Improve debug message
...
--HG--
branch : build_pipeline_py
11 years ago
31d5b54e74
Let prim checker only open files with ig extension
...
--HG--
branch : build_pipeline_py
11 years ago
240576ab9c
Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?)
...
--HG--
branch : build_pipeline_py
11 years ago
f5c30593c8
Merge with default
...
--HG--
branch : build_pipeline_py
11 years ago
2c4ca0d915
Include world editor files in rbank process, part of what caused water not to build
...
--HG--
branch : build_pipeline_py
11 years ago
32ca8d61fe
Add more paths to the build gamedata configuration
...
--HG--
branch : build_pipeline_py
11 years ago
439ba0713e
Build pacs prim list txt outside repository
...
--HG--
branch : build_pipeline_py
11 years ago
dfb2815bcd
Add separate target directory for shard data
...
--HG--
branch : build_pipeline_py
11 years ago
6f7e5e7c72
Update default paths
...
--HG--
branch : build_pipeline_py
11 years ago
11c9f6a91b
Merge with default
...
--HG--
branch : build_pipeline_py
11 years ago
48d2c22639
Merge with default
...
--HG--
branch : kaetemi-cleanup
11 years ago
89a2a2ce99
Do not select stereo display debugger when HMD is set to Auto in Snowballs
11 years ago
ca31e78f7c
Remove georges4cvs feature
11 years ago
bcb2f48940
Remove georges4cvs feature
11 years ago
c9a9839ce6
Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1)
11 years ago
1c50b1f943
Fixed: Compilation under Mac OS X 10.9
11 years ago
e995784886
Fixed typo issue 60
11 years ago
71b0f9ae92
Issue #60
...
does seem to work better when latency is high
11 years ago
60495f79ac
Merge
11 years ago
b6441edf2d
Fix for Issue #94
11 years ago
a5a9532a13
Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h)
11 years ago
16dbe48ed5
use NEL CFile function for file test
...
--HG--
branch : lightmap_optimizer_port_to_linux
11 years ago
a6d9521ae6
Merged default into lightmap_optimizer_port_to_linux
...
--HG--
branch : lightmap_optimizer_port_to_linux
11 years ago
54c53255b1
make the programm compile on linux plateform
...
--HG--
branch : lightmap_optimizer_port_to_linux
11 years ago
09e3471f1b
Fixed: Compilation with freetype
11 years ago
43c48ad36a
Changed: Enable ig_elevation everywhere (patch by Liria)
11 years ago
41a475b8f3
Merged default into ig_elevaton_port_to_linux
...
--HG--
branch : ig_elevaton_port_to_linux
11 years ago
ac48221c8b
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
...
--HG--
branch : ig_elevaton_port_to_linux
11 years ago
207d7323ce
Fix Qt build on Windows
11 years ago
Nimetu
ea5a36b105
Remove tooltip debug message from logs
...
--HG--
branch : misc-patches
11 years ago
Nimetu
4c2531474a
Fix typo (issue #70 )
...
--HG--
branch : misc-patches
11 years ago
Nimetu
3cd6ecdb82
Add deadlock counter to prevent endless loop (issue #73 )
...
--HG--
branch : misc-patches
11 years ago
935ea04c58
dont force null driver, doesnt work on all cards and disable maximising max while running pipeline
11 years ago
db3a789ab4
un kaetemi'd the pipeline
11 years ago
2c0d64e8ff
added single bat file to run whole pipeline
11 years ago
3a84270a84
Textures with DSDT/DUDV format will now be uploaded as RG8. Ryzom will now not crash while entering world.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
fb38a7a0a7
Disable lights when the material isn't lighted.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
2a158e76e1
Lights should now be turned off even when enableLightInternal is called directly. This also fixes the dark background on the character selection screen.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
9c69e1bf84
Material colors ( ambient, diffuse, specular ) should now be used when there's no texture available.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
6196077160
Changed: #85 Compilation with STLport + EOL
11 years ago
986edb216f
Fixed : #85 Compilation with STLport
11 years ago
c718ff693a
Fixed: Assign instead of comparison
11 years ago
b219623129
Fixed: Verbose warning
11 years ago
b96ad682f5
Fixed: Compilation under Mac OS X
11 years ago
a45bbd96c5
Fixed: Warning with clang
11 years ago
af1721a0a4
Changed: Don't need to change _PolygonSmooth if value is the same
11 years ago
166607f644
Changed: Implement VSync under Mac OS X
11 years ago
73196fe7fe
Changed: Replace strlwr by toLower
11 years ago
b46c316940
Fixed : #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
11 years ago
dda2215ed8
Fixed: Wrong algorithm
11 years ago
6b3b85962a
Changed: EOL
11 years ago
d8a6c9f966
Fixed: Warning with clang
11 years ago
36a537a88e
Changed: Replaced atof by fromString
11 years ago
b7082644f0
Changed: Updated OpenGL registry
11 years ago
a119d3e1a0
Use the view matrix instead of modelview to transform the light stuff.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
8f2e75415c
Set up the normalmatrix in the driver and feed it to the shaders, instead of calculating it in the shaders.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
9c0e1c2449
Tattos ( and other multitextured stuff ) will now show up again, even if there's only one texture coordinate set.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
7f7a3e159b
Reverse directional light direction as it is done in the old OpenGL driver. Also normalize normal.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
90dc025fd8
Fixed: Some uniforms names were wrong after the merge, which led to rendering issues.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
eb9b3e4f0f
Implemented light controls.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
6dfafa7ae1
Merge
11 years ago
1cc71457eb
Implemented a basic fog control widget.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
59abfb8a1d
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
...
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
df7110d2d6
Bad merge resolution, fixed a couple source files which merged poorly.
...
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
d86f150caa
Bad merge resolution, fixed the build files that merged poorly.
...
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
7381de073e
fixed bad merge
11 years ago
057fe3e0f7
Merge
11 years ago
ed885d3df6
Replaced ARB VertexAttribArray stuff with the core calls.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
d37b004372
Removed some more deprecated stuff.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
a9a9768872
Removed ARB fragment shader stuff.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
f768704cbf
Removed some ATI stuff.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
6947a58ba1
Removed fixed embm stuff.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
8276cb0140
We shouldn't set up a generated or newly compiled shader program if we already have one ( set up from outside the driver for example ).
...
--HG--
branch : gsoc2013-dfighter
11 years ago
82a7237e7d
Forgot to actually add the driver infos to the list, which caused the driver to hang on deletion.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
c105164eeb
Getting rid of z-order assignment warning.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
892ed1ed3d
merge from default
...
--HG--
branch : gsoc2011-worldeditorqt
11 years ago
0001719d99
Merged in DJanssens/quitta-ryzomcore (pull request #25 )
...
Ryzom AMS - GSOC Project
11 years ago
982b99d8d0
Merged the GPU program stuff from mainline.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
563afd027c
Fix #67 bad NELID in vertex program parser
11 years ago
3b16f096cc
Merge with rename commit.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
32e814ecb6
Use separate shaders in the OpenGL3 driver.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
eb3c58cce9
Fixed: Use multiarch library path under Linux
11 years ago
de43ea8d86
Fixed: Some warnings
11 years ago
f2ee0e99d8
Changed: Detect Windows 8 and Windows Server 2012
11 years ago
c7899841d3
Fixed: Compilation under Linux
11 years ago
eebe74066e
Changed: Include Lua headers directory for GUI Editor
11 years ago
43bbfe3da7
Fixed: Some warnings
11 years ago
3b4730c890
Fix warnings
11 years ago
85365fd7bb
Fix line endings
11 years ago
b70ce1eb09
Renamed OpenGL3 to opengl3
...
--HG--
branch : gsoc2013-dfighter
11 years ago
ace1b5386b
Check GL_ARB_separate_shader_objects extension on startup, and load related functions.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
cf6d2a88bc
Removed some now unused methods.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
afb56ea660
Moved the rendering methods into a new file.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
b0613e334c
Removed a now unused file.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
9d3e3a6a73
GL_VERTEX_PROGRAM_TWO_SIDED_ARB isn't used in the GL3 driver.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
7b5aaf7e0f
Some cleanup, most of the old OpenGL stuff should be gone.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
c8c296f484
Changed: Created NELID macro to fix warning "multi-character character constant"
11 years ago
5326324b56
Some comments.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
69a4a9f9a5
Two sided rendering, while using dynmat.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
390d1bb156
Don't call newMaterial() every time we load a (sub)material.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
dbd5185de1
Only use the shader combo box for the user shaders.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
586c25f864
When clearing the dynmat, should clear all of them. Also fixes a crash.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
3949c210f6
OpenGL should be fed a clamped color value.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
76204a844d
When changing a shader in the editor, reload it in the driver too.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
b775237215
It's now possible to render using the user shaders and dynmat.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
a484de5b3f
Merge with quitta-gsoc-2013
11 years ago
bb7297f260
Fixed: Wrong variable used to compute array length
11 years ago
b7ddc2c0d2
Fixed: OpenGL ES driver compilation
11 years ago
82904232d2
Fixed: Warnings with GCC
11 years ago
6695a9064e
Changed: Created NELID macro to fix warning "multi-character character constant"
11 years ago
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
8269ec7be5
Wrong direction, wrong lighting!
...
--HG--
branch : gsoc2013-dfighter
11 years ago
11fe86e552
Forgot to actually pass the direction in the previous commit...
...
--HG--
branch : gsoc2013-dfighter
11 years ago
72e7d09113
Don't calculate these more than once.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
69c41a31ae
These positions and directions were supposed to be in eye coords.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
0453f30582
Added lighting to the specular shader.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
f194704a28
Refactored directional lighting a little. No need to calculate things more than once.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
0ab68ef25f
Added point light support.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
9a647a893c
Specular shader should compile even when there's no fog added.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
2e4b6bb6ae
Don't try to edit stock shaders.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
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
1d71a540ba
Apparently QColor::set[color]f takes colors as floats clamped to the [0,1] range.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
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
6c58856ed7
Shininess is now loaded from the material as a uniform instead of being hardcoded.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
4ba9d815d4
Colors are now set from the light setup, rather than being hardcoded.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
6f396aa8f7
Added the directional light(s) to the lightmap shader too.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
01ef7fd973
The specular calculation is probably faster this way.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
4ec92d2f06
Simplified the directional light shader generator functions.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
28c4b5b157
Added specular term to the directional lights.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
354d2b8c65
Added ambient term support for directional light.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
43817746ec
Renamed light[n]Col to light[n]ColDiff.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
0def5caf54
Added diffuse directional light support to the normal shader.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
3c99323ada
Apparently typos and redundantly setting uniforms can totally ruin rendering :D
...
--HG--
branch : gsoc2013-dfighter
11 years ago
5fbfe7b17f
Since now we have fog support, this doesn't need to be disabled anymore.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
1a669307da
Fix typo
11 years ago
ce9e0a397b
Fix regression from stereo branch in wind tree
11 years ago
046e3c92da
Fix compile error in vertex program
11 years ago
3c099397d8
Update supportVertexProgram calls
11 years ago
e99bc7ba69
Remove old interface
11 years ago
256f7ff06c
Cleanup unused code
11 years ago
8d57eac3d4
Some basic fog.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
6dfc8d0a00
Rename
...
--HG--
branch : multipass-stereo
11 years ago
973215e1d0
Cleanup
...
--HG--
branch : multipass-stereo
11 years ago
96dc139ddd
Merge with default
...
--HG--
branch : multipass-stereo
11 years ago
df123d6b89
Fix compile errors caused by missing includes
11 years ago
d2bc32e598
Merge with default
...
--HG--
branch : multipass-stereo
11 years ago
cd9baf8f89
Cleanup
...
--HG--
branch : multipass-stereo
11 years ago
74cff50842
Use named indices with wind tree program
...
--HG--
branch : multipass-stereo
11 years ago
c766940e75
Use named indices for per pixel light vertex program
...
--HG--
branch : multipass-stereo
11 years ago
f9c9c1836a
Use named uniform indices for lighted vertex program
...
--HG--
branch : multipass-stereo
11 years ago
61af565bf9
Updated wind tree program container
...
--HG--
branch : multipass-stereo
11 years ago
c353121771
Use lighted vertex program container for per pixel light program
...
--HG--
branch : multipass-stereo
11 years ago
a72f25e763
Add container for lighted vertex program
...
--HG--
branch : multipass-stereo
11 years ago
ab231ea700
Adjust order for meshvp
...
--HG--
branch : multipass-stereo
11 years ago
278e19743c
Do not use old interface here
...
--HG--
branch : multipass-stereo
11 years ago
d5c2a0527d
Modify calls in bloom effect
...
--HG--
branch : multipass-stereo
11 years ago
5e14dc4458
Update veget implementation
...
--HG--
branch : multipass-stereo
11 years ago
9d93ae51a3
Fixes for d3d
...
--HG--
branch : multipass-stereo
11 years ago
c6b714299a
Instead of their own bool, store enabled features in the features variable as a flag.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
bbb4762b77
Move shader description generation to it's own method.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
06d7bd9c74
Added alpha test to generated shaders.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
d6558b5b0d
Fixed some typos with shader generation.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
21a70b4211
Update d3d implementation and add some debugging code
...
--HG--
branch : multipass-stereo
11 years ago
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
e8d77e23e0
Rename of a d3d specific class
...
--HG--
branch : multipass-stereo
11 years ago
c6139419ac
Partial update of veget vp
...
--HG--
branch : multipass-stereo
11 years ago
5fbb220795
Update some test code
...
--HG--
branch : multipass-stereo
11 years ago
c53aa6958e
Small adjustment to landscape vp parameter setting
...
--HG--
branch : multipass-stereo
11 years ago
88cbc2f82b
Simplify
...
--HG--
branch : multipass-stereo
11 years ago
abafc9b1ef
Adjust landscape vertex program to use new interface
...
--HG--
branch : multipass-stereo
11 years ago
36a30e83a0
Don't try to render if can't set program up.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
1acccdb5ef
Uniform index caching.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
5ad617efb6
Use new program interface for water vertex program
...
--HG--
branch : multipass-stereo
11 years ago
32809d646a
Set driver parameters
...
--HG--
branch : multipass-stereo
11 years ago
64643e564b
Some fixes
...
--HG--
branch : multipass-stereo
11 years ago
0429e67903
Use CSmartPtr for vertex program
...
--HG--
branch : multipass-stereo
11 years ago
8f4fe87b7b
Set params from storage
...
--HG--
branch : multipass-stereo
11 years ago
484a946c60
Fix incorrectly removed line
...
--HG--
branch : multipass-stereo
11 years ago
b03895f5f3
Missed file in last commit
...
--HG--
branch : multipass-stereo
11 years ago
e3dead19e4
Replace temporary CMaterial code
...
--HG--
branch : multipass-stereo
11 years ago
e9444ce36a
Implement param storage copy
...
--HG--
branch : multipass-stereo
11 years ago
bb625c33bd
Flag some TODO's
...
--HG--
branch : multipass-stereo
11 years ago
87b24bc4ab
Add glsl pixel program for stereo distortion
...
--HG--
branch : multipass-stereo
11 years ago
16290f7ff9
Merging default.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
ac2e087fbf
Cleanup abstract gpu program interface
...
--HG--
branch : multipass-stereo
11 years ago
0d743d7f37
Implement new driver interface in Direct3D driver
...
--HG--
branch : multipass-stereo
11 years ago
81876009d3
Implement new driver interface in OpenGL driver
...
--HG--
branch : multipass-stereo
11 years ago
d1b93ac3d6
Expand parameter interface
...
--HG--
branch : multipass-stereo
11 years ago
882118612d
Moved some constants to uniforms.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
77ae38e452
Added a very primitive shader caching scheme.
...
--HG--
branch : gsoc2013-dfighter
11 years ago
e84e08b0f6
Reduce function duplication
...
--HG--
branch : multipass-stereo
11 years ago
4d1b5d90c0
Builtin parameter set functions
...
--HG--
branch : multipass-stereo
11 years ago
afe6c16bf3
Separate count and size
...
--HG--
branch : multipass-stereo
11 years ago
05583d134a
Cleanup driver interface
...
--HG--
branch : multipass-stereo
11 years ago
0b9092a547
Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)
11 years ago
0ccec811d6
Changed: Updated Freetype libraries variable
11 years ago
87ee7fa8d2
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
11 years ago
235bfcfd94
Add additional set functions
...
--HG--
branch : multipass-stereo
11 years ago
f0af3326e6
Add gpu program params storage structure
...
--HG--
branch : multipass-stereo
11 years ago
ee0396bd6f
Implement new gpu program interface in direct3d driver
...
--HG--
branch : multipass-stereo
11 years ago
350b580085
Implement new gpu program interface in opengl driver
...
--HG--
branch : multipass-stereo
11 years ago
1fa02cae9e
Make gpu programs use abstract gpu program class
...
--HG--
branch : multipass-stereo
11 years ago
97c9c26690
Add abstract gpu program and source classes
...
--HG--
branch : multipass-stereo
11 years ago
361b7eab74
Fix compile error
11 years ago
89b945bb8c
Changed: Minor changes
11 years ago
86dfd0350b
Fixed: Integer 32 bits conversion to 64 bits pointer
11 years ago
d03c795dd8
Changed: Don't use NLMISC includes in NLMISC PCH
11 years ago
ca9597e11e
Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style
11 years ago
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
34de0b5569
Removed renderTriangles2 as the normal render loop is used now.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
a1cf2c640b
This too.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
35429fea43
Oups forgot this when changing the rendering loop.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
7307d748ea
Sometimes shapes have 0 materials?!
...
--HG--
branch : gsoc2013-dfighter
12 years ago
14aea7acc9
Removed the debug triangle from the material editor plugin.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
eabc209303
Render from the normal loops.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
888812e72d
Only validate the shader program after it's set up. Avoids false alarm.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
5bc7ecf799
Specular shader is now on GLSL.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
86482ed82f
Fixed some shader compile errors.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
ed23ec247d
Render lightmaps with GLSL.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
0ab6322955
More fixed functionality pipeline disabled with conditional build.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
997a231bff
Conditionally build some deprecated functions. Also little adjustment to the shader texenv generator.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c74e279282
Some settings for the normal shaded material.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
e740fd4aeb
Don't crash when releasing.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
d67640dab6
Render with GLSL. Long way to go.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
169ee413df
Redundant cloud shader code.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
f77bcf6981
Generate cloud shader.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
2c84b164ee
Water shader generation.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
ea8a845ab9
Add support for LibVR
...
--HG--
branch : multipass-stereo
12 years ago
7782576dfc
Merge with default
...
--HG--
branch : multipass-stereo
11 years ago
6d10e3189c
Changed: Formatting
12 years ago
881912fa34
Fixed: Crash when trying to display a missing texture
12 years ago
750e7b5e8e
A little explanation after I successfully decyphered this.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
d64dd4f23f
Generate shader for per-pixel without specular.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
6b3b8855ee
Generate Per-Pixel Lighting shader.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
2ca79259ce
More work on specular shader generation. Hopefully now it's right.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
1414f4d3c1
Little bit of refactoring.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
12df2fd71c
Generate specular shader.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
69cc5e48ed
Lightmap shader generator.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
f6737c8aa4
UserColor shader should use the normal generator.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
4f8ac17529
Implemented the mapping of TexEnv calls to GLSL. More or less.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c49265b9db
The stringstream used is now part of the generator class.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
7384cdd10a
Added offset enum.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
0dcb470a19
Generate the pixel shader ins too.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
46363f1909
Started working on the shader generator.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
d67198580a
Implemented uniform querying, setting. Also updated the test triangle.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
3ca6a98aec
Made the triangle debug program a bit more complicated, now using interpolated color.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
41e84066fb
Better store vertex and pixel programs separately so we can detach them if needed.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
f5358f712c
Rendering the debug triangle with GLSL now works.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
b3ea9ee787
Implemented shader and program object classes.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
ed5741addd
Added stubs for GLSL program classes.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
f387256984
Added triangle drawing for debug purposes.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c7e8ebcf05
Added some more GLSL related calls.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
50bb8c5d60
Made some GLSL related OpenGL functions available.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
dd0a691fb8
This also belongs there.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
90595b5bb6
Removed NV Texture env combine stuff.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
3aae79c38b
Removed NV Texture Shader related stuff.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
2c7f848c83
Changed: Tabulations to spaces
12 years ago
6fba0c094a
Merging default
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c90f51afbe
Look for OpenGL 3.3 not 1.2 on startup.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
d0d69d7c77
Make it so that bad text always throws a nlwarning
12 years ago
a81db21e0a
Removed lots of EXT Vertex Shader related code.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
932f2bdd27
Removed lots of Nvidia shader related code.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
71cdf88b81
Fix warning
...
--HG--
branch : multipass-stereo
12 years ago
f925666d83
Manage the texture matrices too.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
b1777ff546
Projection matrix is now generated and managed by Nel and only loaded into OpenGL when dirty.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
f34f4d10d3
While I'm at it, I've renamed the VBO parameters too for the same reason.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
31451aa0f6
Removed the ARB word from the names of CVertexArrayRangeARB and CVertexBufferHardARB.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
cfc4565b5d
Removed more stuff that's no longer neccessary now that we only work with VBO.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
96b2df8405
Merge with default
...
--HG--
branch : multipass-stereo
12 years ago
53bebec880
Add some basic prediction to CCDBNodeBranch::find
...
--HG--
branch : kaetemi-optimize
12 years ago
3bc5d88d78
Force link
12 years ago
6360302a2b
Use VBO only.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
bb6195f858
Always prefer VBOs as OpenGL core requires the use of VBOs.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
44188b58b7
We only have 1 kind of HW VBO left.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
0d98540f2e
Ryzom checks for 0 allocated AGP/Video RAM, so lie max. here instead of saying 0.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
adab29e5a6
There's no need for *this* dummy VB either.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
5e69d558ec
Since we use HW VBO, we don't need to actually check for it.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
e41a15ae30
Allow Ryzom client to use the new driver.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
d06f675c08
Removed more of the vendor specific VBO stuff ( function definitions for example )
...
--HG--
branch : gsoc2013-dfighter
12 years ago
eba12f770f
Merge with default
...
--HG--
branch : quitta-gsoc-2013
12 years ago
e8db641b47
Merge with default
...
--HG--
branch : quitta-gsoc-2013
12 years ago
28c49a0427
These friends and the function are now pointless.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
5c7540d85e
Removed vendor specific VBO code.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
12baee2fcf
fix for getting client working + possibly auto login for ingame part
...
--HG--
branch : quitta-gsoc-2013
12 years ago
8f45e49fa0
GL3 driver can now be instantiated.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
7f0ae42a40
Finally finished cleaning the OpenGL ES stuff.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
1c3fbf0256
Improve performance of UsedTexture debugging info in OpenGL driver
...
--HG--
branch : kaetemi-optimize
12 years ago
e44b663bdb
Even more OpenGL ES cleanup.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
2b5eddbe95
More OpenGL ES cleanup.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
64335ae0b8
NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked
12 years ago
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
7bb8dec40c
Parse action handler condition for interface link in advance
...
--HG--
branch : kaetemi-optimize
12 years ago
d5308215aa
Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager
...
--HG--
branch : kaetemi-optimize
12 years ago
5ad6373f61
Build ligo outside the database
...
--HG--
branch : build_pipeline_py
12 years ago
879f2f3a85
More GLES stuff removed.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
40da205b59
Removed some GLES related code.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
f6ee2707ea
Merge with default
...
--HG--
branch : multipass-stereo
12 years ago
296083ba61
First batch of renames.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
d5e5775f29
"Forked" the OpenGL driver.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
1c0d74fc00
Unix build fixes.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
78595ec0e6
Silently sneaking in a nicer splash image for ovqt
12 years ago
dcf3ba2785
Move unix event emitter out of the driver, to NL3D.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
1e9771d054
Merge with default
...
--HG--
branch : multipass-stereo
12 years ago
e435a07bb6
Fix bug #45 crash in zone lighter with large number of CPU cores
12 years ago
e9c274c135
Use tags for pacs prim export
12 years ago
aeddda3e19
Fixed: lua_open() doesn't exist with Lua 5.2
12 years ago
296b4384a8
Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange)
12 years ago
0c64261e22
The 3dsmax exporter will now use the material file specified in the Nel material.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
f94960dffe
Added the Nel material file selection possibility to the Nel material 3dsmax startup script.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
3ff8613205
Merging default.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
7a9ae41fd5
Missing a letter e here
...
--HG--
branch : gsoc2013-dfighter
12 years ago
ac98c00088
The prototype of the material exporter. It's only called when exporting a mesh, for now.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
80bcf2026a
If dynamic material already exists, simply just reinitialize it.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
662b75f87a
Merge with default
...
--HG--
branch : multipass-stereo
12 years ago
02dc3c1cfe
Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs
12 years ago
f280f4673f
Merge with default
...
--HG--
branch : multipass-stereo
12 years ago
53e11d0d68
Merge with default
...
--HG--
branch : multipass-stereo
12 years ago
9f185ce38d
Fix an error in 3ds Max with the material script
12 years ago
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
b776409cc8
More material properties are converted now.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
6ad18a88f5
Shouldn't reset the material properties, when editing them.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
fb3f069a38
Should be able to save QColor based QVariant too.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c8147b301c
Oups. Wrong copypaste of my own code.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
192e9c058a
More work on the Variant type. Also modified material editor to use it.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
a113c81db3
Added a Variant type ( for holding variable type values ) to NLMISC
...
--HG--
branch : gsoc2013-dfighter
12 years ago
9306bd71e6
Added GUI code for multi/sub-material.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
04dcad32e7
Added support for adding basic primitives cube, sphere, cylinder, teapot.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
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
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
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
66fb3c1284
Shapes can now be loaded and rendered to ViewPortWidget.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
8408ddd552
Added ViewPortWidget.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
96eb64ecbe
Shader can now be set for the rendering pass, using the shader combo box in MaterialWidget.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
cc86cdd3ef
ShaderEditorWidget will now load/save it's content.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c9cd9cdd3c
Shaders will now show up in the shader combobox of MaterialWidget.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
1f2ff5721e
Shaders are now loaded/saved/deleted from the disk.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
293601e80e
Fixed definition tests for optional LibOVR
...
--HG--
branch : multipass-stereo
12 years ago
a33a0e5c56
LibOVR is optional, and is disabled by default
...
--HG--
branch : multipass-stereo
12 years ago
c60bd3e3f5
Added LibOVR finder and Linux support, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
00b47d6a50
Implemented the Shader widget, more or less.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
128c2a3270
Changed the Shader widget a little.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
a57bb57c58
Missed these.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
a71e4bc3ed
Added some Shader related classes. They are not yet complete.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
eab2386ff6
Don't render to texture when in wireframe mode, re #43
...
--HG--
branch : multipass-stereo
12 years ago
248f07ad9e
Put stereo render loop inside ryzom client main loop, see #43
...
--HG--
branch : multipass-stereo
12 years ago
b1aaf05bf6
Init/release VR interfaces in ryzom client, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
352ee42571
Distort 2D gui as well, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
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
2e6b1a834f
We don't want duplicate property names and labels either.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
9294cdc644
We don't want duplicate passes.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
ea06a2c656
Property values can now be changed.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
dcd77495ca
Fix particles being animated twice in stereo render, see #43
...
--HG--
branch : multipass-stereo
12 years ago
bf8bd64f0d
Add stereo debugger for visually comparing rendered frames, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
9ee24b3b93
Property browser will now show the properties.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
e68e7161d8
Use width instead of height of screen for hmd fov, re #43
...
--HG--
branch : multipass-stereo
12 years ago
1fe2b62eb1
Add minimal head model and world scale, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
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
fa3ad050de
It's not a bad idea to always have at least 1 pass.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
0dd8764e45
Make bloom work together with render target used for the rift shader, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
52f4a37939
Remove unnecessary user render target code from bloom, see #43
...
--HG--
branch : multipass-stereo
12 years ago
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
391fa6dcff
Add arbfp1 and fp40 barrel fragment programs, see #43
...
--HG--
branch : multipass-stereo
12 years ago
c9605dde57
Little bit of refactoring.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
73d3176f0c
Test arbfp1, see #43
...
--HG--
branch : multipass-stereo
12 years ago
d13da7a398
Prefer NPOT texture over RECT texture
...
--HG--
branch : multipass-stereo
12 years ago
832178a83f
Adding / Removing properties will now work.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
43f8adff79
Render left and right deformed view, re #43
...
--HG--
branch : multipass-stereo
12 years ago
94fe455a1a
Material widget now retrieves the passes when loading a material.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
ce92c13289
Test the barrel shader, see #43
...
--HG--
branch : multipass-stereo
12 years ago
067676c049
Changing passes should now show up on the material widget too!
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c5c6f7c871
Render the scene to a target texture for the stereo rendering filter, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
7766116494
Fix a render target issue, see #43
...
--HG--
branch : multipass-stereo
12 years ago
02e61b1e1b
Implemented the functionality of the Render Passes widget.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
c5e1235cbb
Create stereo render target, see #43
...
--HG--
branch : multipass-stereo
12 years ago
30f8c9f9e1
Added a Nel3D proxy class.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
85109102b2
Add interface for stereo display render targets, ref #43
...
--HG--
branch : multipass-stereo
12 years ago
fe91e2a751
Cleanup
...
--HG--
branch : multipass-stereo
12 years ago
8c35946010
Material properties widget is now linked to the right button.
...
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi
kervala
StudioEtrange
Matthew Lagoe
liria
Nimetu
Matt Raykowski
Thibaut Girka
Michael Witrant