liria
|
41a475b8f3
|
Merged default into ig_elevaton_port_to_linux
--HG--
branch : ig_elevaton_port_to_linux
|
2014-01-23 00:49:56 +01:00 |
|
liria
|
ac48221c8b
|
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
--HG--
branch : ig_elevaton_port_to_linux
|
2014-01-22 23:49:11 +00:00 |
|
kaetemi
|
207d7323ce
|
Fix Qt build on Windows
|
2014-01-21 12:50:23 +01:00 |
|
Nimetu
|
ea5a36b105
|
Remove tooltip debug message from logs
--HG--
branch : misc-patches
|
2014-01-04 00:20:05 +02:00 |
|
Nimetu
|
4c2531474a
|
Fix typo (issue #70)
--HG--
branch : misc-patches
|
2014-01-03 19:51:50 +02:00 |
|
Nimetu
|
3cd6ecdb82
|
Add deadlock counter to prevent endless loop (issue #73)
--HG--
branch : misc-patches
|
2014-01-03 19:11:49 +02:00 |
|
botanic
|
935ea04c58
|
dont force null driver, doesnt work on all cards and disable maximising max while running pipeline
|
2013-12-30 10:03:49 -08:00 |
|
botanic
|
db3a789ab4
|
un kaetemi'd the pipeline
|
2013-12-30 08:59:59 -08:00 |
|
botanic
|
2c0d64e8ff
|
added single bat file to run whole pipeline
|
2013-12-29 23:25:09 -08:00 |
|
kervala
|
6196077160
|
Changed: #85 Compilation with STLport + EOL
|
2013-11-22 11:25:53 +01:00 |
|
kervala
|
986edb216f
|
Fixed: #85 Compilation with STLport
|
2013-11-22 11:25:12 +01:00 |
|
kervala
|
c718ff693a
|
Fixed: Assign instead of comparison
|
2013-11-22 11:20:07 +01:00 |
|
kervala
|
b219623129
|
Fixed: Verbose warning
|
2013-11-13 22:23:57 +01:00 |
|
kervala
|
b96ad682f5
|
Fixed: Compilation under Mac OS X
|
2013-11-13 22:23:24 +01:00 |
|
kervala
|
a45bbd96c5
|
Fixed: Warning with clang
|
2013-11-13 22:23:02 +01:00 |
|
kervala
|
af1721a0a4
|
Changed: Don't need to change _PolygonSmooth if value is the same
|
2013-11-13 21:55:14 +01:00 |
|
kervala
|
166607f644
|
Changed: Implement VSync under Mac OS X
|
2013-11-13 21:54:45 +01:00 |
|
kervala
|
73196fe7fe
|
Changed: Replace strlwr by toLower
|
2013-11-13 21:53:21 +01:00 |
|
kervala
|
b46c316940
|
Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
|
2013-11-13 21:52:21 +01:00 |
|
kervala
|
dda2215ed8
|
Fixed: Wrong algorithm
|
2013-11-13 21:46:42 +01:00 |
|
kervala
|
6b3b85962a
|
Changed: EOL
|
2013-11-13 21:45:06 +01:00 |
|
kervala
|
d8a6c9f966
|
Fixed: Warning with clang
|
2013-11-13 21:40:41 +01:00 |
|
kervala
|
36a537a88e
|
Changed: Replaced atof by fromString
|
2013-11-13 21:37:28 +01:00 |
|
kervala
|
b7082644f0
|
Changed: Updated OpenGL registry
|
2013-11-13 20:31:08 +01:00 |
|
Botanic
|
6dfafa7ae1
|
Merge
|
2013-11-02 16:35:26 -07:00 |
|
sfb
|
59abfb8a1d
|
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-28 12:58:08 -05:00 |
|
sfb
|
df7110d2d6
|
Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-28 11:24:31 -05:00 |
|
sfb
|
d86f150caa
|
Bad merge resolution, fixed the build files that merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-28 11:24:02 -05:00 |
|
Botanic
|
7381de073e
|
fixed bad merge
|
2013-10-26 00:57:50 -07:00 |
|
Botanic
|
057fe3e0f7
|
Merge
|
2013-10-26 00:50:56 -07:00 |
|
sfb
|
892ed1ed3d
|
merge from default
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-23 12:08:09 -05:00 |
|
Matt Raykowski
|
0001719d99
|
Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
|
2013-10-19 16:02:52 -05:00 |
|
kaetemi
|
563afd027c
|
Fix #67 bad NELID in vertex program parser
|
2013-10-06 20:06:53 +02:00 |
|
kervala
|
eb3c58cce9
|
Fixed: Use multiarch library path under Linux
|
2013-09-30 09:11:35 +02:00 |
|
kervala
|
de43ea8d86
|
Fixed: Some warnings
|
2013-09-29 16:26:24 +02:00 |
|
kervala
|
f2ee0e99d8
|
Changed: Detect Windows 8 and Windows Server 2012
|
2013-09-29 13:41:42 +02:00 |
|
kervala
|
c7899841d3
|
Fixed: Compilation under Linux
|
2013-09-28 10:18:35 +02:00 |
|
kervala
|
eebe74066e
|
Changed: Include Lua headers directory for GUI Editor
|
2013-09-27 16:43:02 +02:00 |
|
kervala
|
43bbfe3da7
|
Fixed: Some warnings
|
2013-09-27 16:30:55 +02:00 |
|
kaetemi
|
3b4730c890
|
Fix warnings
|
2013-09-27 01:32:01 +02:00 |
|
kaetemi
|
85365fd7bb
|
Fix line endings
|
2013-09-27 00:08:49 +02:00 |
|
kervala
|
c8c296f484
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
2013-09-24 21:33:59 +02:00 |
|
Quitta
|
a484de5b3f
|
Merge with quitta-gsoc-2013
|
2013-09-23 00:49:16 +02:00 |
|
kervala
|
bb7297f260
|
Fixed: Wrong variable used to compute array length
|
2013-09-22 13:23:03 +02:00 |
|
kervala
|
b7ddc2c0d2
|
Fixed: OpenGL ES driver compilation
|
2013-09-22 13:20:53 +02:00 |
|
kervala
|
82904232d2
|
Fixed: Warnings with GCC
|
2013-09-22 13:20:19 +02:00 |
|
kervala
|
6695a9064e
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
2013-09-22 13:10:57 +02:00 |
|
kaetemi
|
1a669307da
|
Fix typo
|
2013-09-14 19:05:54 +02:00 |
|
kaetemi
|
ce9e0a397b
|
Fix regression from stereo branch in wind tree
|
2013-09-14 18:58:23 +02:00 |
|
kaetemi
|
046e3c92da
|
Fix compile error in vertex program
|
2013-09-14 17:53:47 +02:00 |
|
kaetemi
|
3c099397d8
|
Update supportVertexProgram calls
|
2013-09-14 16:43:36 +02:00 |
|
kaetemi
|
e99bc7ba69
|
Remove old interface
|
2013-09-14 16:45:00 +02:00 |
|
kaetemi
|
256f7ff06c
|
Cleanup unused code
|
2013-09-14 16:23:11 +02:00 |
|
kaetemi
|
6dfc8d0a00
|
Rename
--HG--
branch : multipass-stereo
|
2013-09-14 00:46:10 +02:00 |
|
kaetemi
|
973215e1d0
|
Cleanup
--HG--
branch : multipass-stereo
|
2013-09-14 00:36:06 +02:00 |
|
kaetemi
|
96dc139ddd
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-09-13 23:24:13 +02:00 |
|
kaetemi
|
df123d6b89
|
Fix compile errors caused by missing includes
|
2013-09-13 23:23:19 +02:00 |
|
kaetemi
|
d2bc32e598
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-09-13 23:07:49 +02:00 |
|
kaetemi
|
cd9baf8f89
|
Cleanup
--HG--
branch : multipass-stereo
|
2013-09-13 23:02:35 +02:00 |
|
kaetemi
|
74cff50842
|
Use named indices with wind tree program
--HG--
branch : multipass-stereo
|
2013-09-13 22:20:52 +02:00 |
|
kaetemi
|
c766940e75
|
Use named indices for per pixel light vertex program
--HG--
branch : multipass-stereo
|
2013-09-13 21:47:42 +02:00 |
|
kaetemi
|
f9c9c1836a
|
Use named uniform indices for lighted vertex program
--HG--
branch : multipass-stereo
|
2013-09-13 21:31:47 +02:00 |
|
kaetemi
|
61af565bf9
|
Updated wind tree program container
--HG--
branch : multipass-stereo
|
2013-09-13 20:45:06 +02:00 |
|
kaetemi
|
c353121771
|
Use lighted vertex program container for per pixel light program
--HG--
branch : multipass-stereo
|
2013-09-13 20:00:20 +02:00 |
|
kaetemi
|
a72f25e763
|
Add container for lighted vertex program
--HG--
branch : multipass-stereo
|
2013-09-13 19:03:05 +02:00 |
|
kaetemi
|
ab231ea700
|
Adjust order for meshvp
--HG--
branch : multipass-stereo
|
2013-09-13 18:25:52 +02:00 |
|
kaetemi
|
278e19743c
|
Do not use old interface here
--HG--
branch : multipass-stereo
|
2013-09-13 17:17:11 +02:00 |
|
kaetemi
|
d5c2a0527d
|
Modify calls in bloom effect
--HG--
branch : multipass-stereo
|
2013-09-13 17:11:42 +02:00 |
|
kaetemi
|
5e14dc4458
|
Update veget implementation
--HG--
branch : multipass-stereo
|
2013-09-13 17:09:05 +02:00 |
|
kaetemi
|
9d93ae51a3
|
Fixes for d3d
--HG--
branch : multipass-stereo
|
2013-09-13 17:08:56 +02:00 |
|
kaetemi
|
21a70b4211
|
Update d3d implementation and add some debugging code
--HG--
branch : multipass-stereo
|
2013-09-11 01:12:37 +02:00 |
|
kaetemi
|
e8d77e23e0
|
Rename of a d3d specific class
--HG--
branch : multipass-stereo
|
2013-09-10 19:53:41 +02:00 |
|
kaetemi
|
c6139419ac
|
Partial update of veget vp
--HG--
branch : multipass-stereo
|
2013-09-10 19:52:14 +02:00 |
|
kaetemi
|
5fbb220795
|
Update some test code
--HG--
branch : multipass-stereo
|
2013-09-10 16:42:51 +02:00 |
|
kaetemi
|
c53aa6958e
|
Small adjustment to landscape vp parameter setting
--HG--
branch : multipass-stereo
|
2013-09-10 16:24:45 +02:00 |
|
kaetemi
|
88cbc2f82b
|
Simplify
--HG--
branch : multipass-stereo
|
2013-09-10 15:59:31 +02:00 |
|
kaetemi
|
abafc9b1ef
|
Adjust landscape vertex program to use new interface
--HG--
branch : multipass-stereo
|
2013-09-10 15:42:42 +02:00 |
|
kaetemi
|
5ad617efb6
|
Use new program interface for water vertex program
--HG--
branch : multipass-stereo
|
2013-09-10 02:07:16 +02:00 |
|
kaetemi
|
32809d646a
|
Set driver parameters
--HG--
branch : multipass-stereo
|
2013-09-10 02:01:57 +02:00 |
|
kaetemi
|
64643e564b
|
Some fixes
--HG--
branch : multipass-stereo
|
2013-09-10 01:29:53 +02:00 |
|
kaetemi
|
0429e67903
|
Use CSmartPtr for vertex program
--HG--
branch : multipass-stereo
|
2013-09-10 00:31:26 +02:00 |
|
kaetemi
|
8f4fe87b7b
|
Set params from storage
--HG--
branch : multipass-stereo
|
2013-09-09 23:39:18 +02:00 |
|
kaetemi
|
484a946c60
|
Fix incorrectly removed line
--HG--
branch : multipass-stereo
|
2013-09-09 23:03:52 +02:00 |
|
kaetemi
|
b03895f5f3
|
Missed file in last commit
--HG--
branch : multipass-stereo
|
2013-09-09 23:01:43 +02:00 |
|
kaetemi
|
e3dead19e4
|
Replace temporary CMaterial code
--HG--
branch : multipass-stereo
|
2013-09-09 21:44:14 +02:00 |
|
kaetemi
|
e9444ce36a
|
Implement param storage copy
--HG--
branch : multipass-stereo
|
2013-09-09 21:05:12 +02:00 |
|
kaetemi
|
bb625c33bd
|
Flag some TODO's
--HG--
branch : multipass-stereo
|
2013-09-09 20:55:23 +02:00 |
|
kaetemi
|
87b24bc4ab
|
Add glsl pixel program for stereo distortion
--HG--
branch : multipass-stereo
|
2013-09-09 20:49:59 +02:00 |
|
kaetemi
|
ac2e087fbf
|
Cleanup abstract gpu program interface
--HG--
branch : multipass-stereo
|
2013-09-09 18:33:38 +02:00 |
|
kaetemi
|
0d743d7f37
|
Implement new driver interface in Direct3D driver
--HG--
branch : multipass-stereo
|
2013-09-09 16:36:29 +02:00 |
|
kaetemi
|
81876009d3
|
Implement new driver interface in OpenGL driver
--HG--
branch : multipass-stereo
|
2013-09-09 14:43:10 +02:00 |
|
kaetemi
|
d1b93ac3d6
|
Expand parameter interface
--HG--
branch : multipass-stereo
|
2013-09-09 12:18:20 +02:00 |
|
kaetemi
|
e84e08b0f6
|
Reduce function duplication
--HG--
branch : multipass-stereo
|
2013-09-09 02:03:40 +02:00 |
|
kaetemi
|
4d1b5d90c0
|
Builtin parameter set functions
--HG--
branch : multipass-stereo
|
2013-09-09 01:53:02 +02:00 |
|
kaetemi
|
afe6c16bf3
|
Separate count and size
--HG--
branch : multipass-stereo
|
2013-09-09 01:31:15 +02:00 |
|
kaetemi
|
05583d134a
|
Cleanup driver interface
--HG--
branch : multipass-stereo
|
2013-09-08 21:57:27 +02:00 |
|
kervala
|
0b9092a547
|
Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)
|
2013-09-08 12:57:34 +02:00 |
|
kervala
|
0ccec811d6
|
Changed: Updated Freetype libraries variable
|
2013-09-08 12:54:05 +02:00 |
|
kervala
|
87ee7fa8d2
|
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
|
2013-09-08 12:52:00 +02:00 |
|
kaetemi
|
235bfcfd94
|
Add additional set functions
--HG--
branch : multipass-stereo
|
2013-09-08 01:49:34 +02:00 |
|
kaetemi
|
f0af3326e6
|
Add gpu program params storage structure
--HG--
branch : multipass-stereo
|
2013-09-08 01:36:01 +02:00 |
|
kaetemi
|
ee0396bd6f
|
Implement new gpu program interface in direct3d driver
--HG--
branch : multipass-stereo
|
2013-09-07 22:00:07 +02:00 |
|
kaetemi
|
350b580085
|
Implement new gpu program interface in opengl driver
--HG--
branch : multipass-stereo
|
2013-09-07 21:30:40 +02:00 |
|
kaetemi
|
1fa02cae9e
|
Make gpu programs use abstract gpu program class
--HG--
branch : multipass-stereo
|
2013-09-07 20:41:07 +02:00 |
|
kaetemi
|
97c9c26690
|
Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
|
2013-09-07 18:33:18 +02:00 |
|
kaetemi
|
361b7eab74
|
Fix compile error
|
2013-09-07 16:05:28 +02:00 |
|
kervala
|
89b945bb8c
|
Changed: Minor changes
|
2013-09-06 15:00:35 +02:00 |
|
kervala
|
86dfd0350b
|
Fixed: Integer 32 bits conversion to 64 bits pointer
|
2013-09-06 14:51:21 +02:00 |
|
kervala
|
d03c795dd8
|
Changed: Don't use NLMISC includes in NLMISC PCH
|
2013-09-06 14:50:19 +02:00 |
|
kervala
|
ca9597e11e
|
Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style
|
2013-09-06 14:49:12 +02:00 |
|
Thibaut Girka
|
ea8a845ab9
|
Add support for LibVR
--HG--
branch : multipass-stereo
|
2013-08-28 08:08:22 +02:00 |
|
kaetemi
|
7782576dfc
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-09-07 16:25:45 +02:00 |
|
kervala
|
6d10e3189c
|
Changed: Formatting
|
2013-08-26 12:34:04 +02:00 |
|
kervala
|
881912fa34
|
Fixed: Crash when trying to display a missing texture
|
2013-08-26 12:33:26 +02:00 |
|
kervala
|
2c7f848c83
|
Changed: Tabulations to spaces
|
2013-08-05 10:30:40 +02:00 |
|
Botanic
|
d0d69d7c77
|
Make it so that bad text always throws a nlwarning
|
2013-08-04 01:43:54 -07:00 |
|
kaetemi
|
71cdf88b81
|
Fix warning
--HG--
branch : multipass-stereo
|
2013-08-03 21:29:47 +02:00 |
|
kaetemi
|
96b2df8405
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-08-01 23:02:49 +02:00 |
|
kaetemi
|
53bebec880
|
Add some basic prediction to CCDBNodeBranch::find
--HG--
branch : kaetemi-optimize
|
2013-08-01 22:47:46 +02:00 |
|
kaetemi
|
3bc5d88d78
|
Force link
|
2013-08-01 10:11:11 +02:00 |
|
Quitta
|
eba12f770f
|
Merge with default
--HG--
branch : quitta-gsoc-2013
|
2013-07-31 16:26:22 +02:00 |
|
Quitta
|
e8db641b47
|
Merge with default
--HG--
branch : quitta-gsoc-2013
|
2013-07-31 16:17:29 +02:00 |
|
Quitta
|
12baee2fcf
|
fix for getting client working + possibly auto login for ingame part
--HG--
branch : quitta-gsoc-2013
|
2013-07-30 01:46:56 +02:00 |
|
kaetemi
|
1c3fbf0256
|
Improve performance of UsedTexture debugging info in OpenGL driver
--HG--
branch : kaetemi-optimize
|
2013-07-29 03:41:10 +02:00 |
|
kaetemi
|
64335ae0b8
|
NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked
|
2013-07-28 21:39:54 +02:00 |
|
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
|
2013-07-28 05:10:07 +02:00 |
|
kaetemi
|
7bb8dec40c
|
Parse action handler condition for interface link in advance
--HG--
branch : kaetemi-optimize
|
2013-07-28 03:02:07 +02:00 |
|
kaetemi
|
d5308215aa
|
Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager
--HG--
branch : kaetemi-optimize
|
2013-07-28 00:48:34 +02:00 |
|
kaetemi
|
5ad6373f61
|
Build ligo outside the database
--HG--
branch : build_pipeline_py
|
2013-07-27 04:03:05 +02:00 |
|
kaetemi
|
f6ee2707ea
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-07-25 21:18:52 +02:00 |
|
kaetemi
|
78595ec0e6
|
Silently sneaking in a nicer splash image for ovqt
|
2013-07-25 02:39:07 +02:00 |
|
kaetemi
|
1e9771d054
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-07-25 00:37:00 +02:00 |
|
kaetemi
|
e435a07bb6
|
Fix bug #45 crash in zone lighter with large number of CPU cores
|
2013-07-24 20:51:43 +02:00 |
|
kaetemi
|
e9c274c135
|
Use tags for pacs prim export
|
2013-07-24 20:51:38 +02:00 |
|
kervala
|
aeddda3e19
|
Fixed: lua_open() doesn't exist with Lua 5.2
|
2013-07-24 18:47:50 +02:00 |
|
kervala
|
296b4384a8
|
Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange)
|
2013-07-24 18:47:04 +02:00 |
|
kaetemi
|
662b75f87a
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-07-19 15:38:49 +02:00 |
|
kaetemi
|
02dc3c1cfe
|
Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs
|
2013-07-19 15:37:25 +02:00 |
|
kaetemi
|
f280f4673f
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-07-19 14:10:07 +02:00 |
|
kaetemi
|
53e11d0d68
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-07-18 23:05:25 +02:00 |
|
kaetemi
|
9f185ce38d
|
Fix an error in 3ds Max with the material script
|
2013-07-18 18:15:53 +02:00 |
|
Michael Witrant
|
293601e80e
|
Fixed definition tests for optional LibOVR
--HG--
branch : multipass-stereo
|
2013-07-06 20:40:42 +02:00 |
|
Michael Witrant
|
a33a0e5c56
|
LibOVR is optional, and is disabled by default
--HG--
branch : multipass-stereo
|
2013-07-06 20:05:19 +02:00 |
|
Michael Witrant
|
c60bd3e3f5
|
Added LibOVR finder and Linux support, ref #43
--HG--
branch : multipass-stereo
|
2013-07-06 19:33:07 +02:00 |
|
kaetemi
|
eab2386ff6
|
Don't render to texture when in wireframe mode, re #43
--HG--
branch : multipass-stereo
|
2013-07-05 03:42:38 +02:00 |
|
kaetemi
|
248f07ad9e
|
Put stereo render loop inside ryzom client main loop, see #43
--HG--
branch : multipass-stereo
|
2013-07-05 02:38:56 +02:00 |
|
kaetemi
|
b1aaf05bf6
|
Init/release VR interfaces in ryzom client, ref #43
--HG--
branch : multipass-stereo
|
2013-07-05 02:04:34 +02:00 |
|
kaetemi
|
352ee42571
|
Distort 2D gui as well, ref #43
--HG--
branch : multipass-stereo
|
2013-07-04 21:12:11 +02:00 |
|
kaetemi
|
dcd77495ca
|
Fix particles being animated twice in stereo render, see #43
--HG--
branch : multipass-stereo
|
2013-07-04 00:42:06 +02:00 |
|
kaetemi
|
bf8bd64f0d
|
Add stereo debugger for visually comparing rendered frames, ref #43
--HG--
branch : multipass-stereo
|
2013-07-04 00:09:10 +02:00 |
|
kaetemi
|
e68e7161d8
|
Use width instead of height of screen for hmd fov, re #43
--HG--
branch : multipass-stereo
|
2013-07-03 06:04:37 +02:00 |
|
kaetemi
|
1fe2b62eb1
|
Add minimal head model and world scale, ref #43
--HG--
branch : multipass-stereo
|
2013-07-03 05:21:32 +02:00 |
|
kaetemi
|
0dd8764e45
|
Make bloom work together with render target used for the rift shader, ref #43
--HG--
branch : multipass-stereo
|
2013-07-03 03:53:32 +02:00 |
|
kaetemi
|
52f4a37939
|
Remove unnecessary user render target code from bloom, see #43
--HG--
branch : multipass-stereo
|
2013-07-03 03:21:57 +02:00 |
|
kaetemi
|
391fa6dcff
|
Add arbfp1 and fp40 barrel fragment programs, see #43
--HG--
branch : multipass-stereo
|
2013-07-02 19:39:05 +02:00 |
|
kaetemi
|
73d3176f0c
|
Test arbfp1, see #43
--HG--
branch : multipass-stereo
|
2013-07-02 18:48:29 +02:00 |
|
kaetemi
|
d13da7a398
|
Prefer NPOT texture over RECT texture
--HG--
branch : multipass-stereo
|
2013-07-02 18:43:15 +02:00 |
|
kaetemi
|
43f8adff79
|
Render left and right deformed view, re #43
--HG--
branch : multipass-stereo
|
2013-07-02 03:34:49 +02:00 |
|
kaetemi
|
ce92c13289
|
Test the barrel shader, see #43
--HG--
branch : multipass-stereo
|
2013-07-02 02:40:27 +02:00 |
|
kaetemi
|
c5c6f7c871
|
Render the scene to a target texture for the stereo rendering filter, ref #43
--HG--
branch : multipass-stereo
|
2013-07-02 00:55:13 +02:00 |
|
kaetemi
|
7766116494
|
Fix a render target issue, see #43
--HG--
branch : multipass-stereo
|
2013-07-02 00:53:45 +02:00 |
|
kaetemi
|
c5e1235cbb
|
Create stereo render target, see #43
--HG--
branch : multipass-stereo
|
2013-07-01 23:23:54 +02:00 |
|
kaetemi
|
85109102b2
|
Add interface for stereo display render targets, ref #43
--HG--
branch : multipass-stereo
|
2013-07-01 21:23:47 +02:00 |
|
kaetemi
|
fe91e2a751
|
Cleanup
--HG--
branch : multipass-stereo
|
2013-07-01 20:15:55 +02:00 |
|
kaetemi
|
5f229667bc
|
Create interface classes for stereo displays and head mounted displays, see #43
--HG--
branch : multipass-stereo
|
2013-06-28 23:19:32 +02:00 |
|
kaetemi
|
1cc5848220
|
Create a clipping frustum, ref #43
--HG--
branch : multipass-stereo
|
2013-06-26 21:35:36 +02:00 |
|
kaetemi
|
e7842982a0
|
Allow multiple user cameras to be calculated separately, useful for sky etc, re #43
--HG--
branch : multipass-stereo
|
2013-06-26 20:57:37 +02:00 |
|
kaetemi
|
38be9b5997
|
Fix warning
--HG--
branch : multipass-stereo
|
2013-06-26 20:10:30 +02:00 |
|
kaetemi
|
202413ab52
|
Adjust 2D interface shift, re #43
--HG--
branch : multipass-stereo
|
2013-06-26 19:58:27 +02:00 |
|
kaetemi
|
4864ce7a5a
|
Add eye distance in 2D interface shift, re #43
--HG--
branch : multipass-stereo
|
2013-06-26 17:24:23 +02:00 |
|
kaetemi
|
5423d4d025
|
Add 2D interface shifting calculations, see #43
--HG--
branch : multipass-stereo
|
2013-06-26 16:59:08 +02:00 |
|
kaetemi
|
39197681fa
|
Correctly adjust text to viewport, re #43
--HG--
branch : multipass-stereo
|
2013-06-26 16:08:48 +02:00 |
|
kaetemi
|
d1bf069708
|
Add some comments, see #43
--HG--
branch : multipass-stereo
|
2013-06-26 15:55:39 +02:00 |
|
kaetemi
|
91be2d64bd
|
Cleanup and make bloom work with stereo rendering, re #43
--HG--
branch : multipass-stereo
|
2013-06-26 15:49:31 +02:00 |
|
kaetemi
|
32a187a199
|
Render from multiple cameras, see #43
--HG--
branch : multipass-stereo
|
2013-06-26 08:00:19 +02:00 |
|
kaetemi
|
a5c9592165
|
Read sensor data and set camera in snowballs, ref #43
--HG--
branch : multipass-stereo
|
2013-06-26 04:57:58 +02:00 |
|
kaetemi
|
a79b9f7e65
|
Add library name to device name, re #43
--HG--
branch : multipass-stereo
|
2013-06-26 02:55:15 +02:00 |
|
kaetemi
|
64821ab4de
|
List stereo devices, see #43
--HG--
branch : multipass-stereo
|
2013-06-26 02:45:49 +02:00 |
|
kaetemi
|
8ded099fbb
|
Added some notes
--HG--
branch : multipass-stereo
|
2013-06-20 00:25:52 +02:00 |
|
kaetemi
|
78179ed809
|
Rename some functions to follow the same naming convention of others
--HG--
branch : multipass-stereo
|
2013-06-19 23:49:39 +02:00 |
|
kaetemi
|
ad5b60963f
|
Cleanup
--HG--
branch : multipass-stereo
|
2013-06-19 23:34:40 +02:00 |
|
kaetemi
|
be33bbc70f
|
Add support for fp40 with opengl
--HG--
branch : multipass-stereo
|
2013-06-19 22:41:03 +02:00 |
|
kaetemi
|
f278ac7638
|
Activate textures for postprocessing material under direct3d
--HG--
branch : multipass-stereo
|
2013-06-19 21:16:13 +02:00 |
|
kaetemi
|
3e91b1a5cf
|
Test texture with postprocessing material, seems to work with opengl
--HG--
branch : multipass-stereo
|
2013-06-19 20:47:23 +02:00 |
|
kaetemi
|
9b0b1008ff
|
Fix linux compile
--HG--
branch : multipass-stereo
|
2013-06-19 16:18:09 +02:00 |
|
kaetemi
|
dfb110b387
|
Add function to check which pixel program profiles are available on a driver
--HG--
branch : multipass-stereo
|
2013-06-19 05:03:47 +02:00 |
|
kaetemi
|
9f1ddc9202
|
Add test for ps.1.1 pixel program in snowballs (it works too now)
--HG--
branch : multipass-stereo
|
2013-06-19 04:03:32 +02:00 |
|
kaetemi
|
1c3fc17d91
|
Cleanup more unneeded code
--HG--
branch : multipass-stereo
|
2013-06-19 02:36:57 +02:00 |
|
kaetemi
|
4200483383
|
Removed unneeded parser related code from the opengl pixel program implementation
--HG--
branch : multipass-stereo
|
2013-06-19 02:33:19 +02:00 |
|
kaetemi
|
197c0687d9
|
Add direct3d diff for old nevrax pixel program code, marked a todo in the comments
--HG--
branch : multipass-stereo
|
2013-06-19 02:10:38 +02:00 |
|
kaetemi
|
f08de2dcdc
|
Added diff to opengl driver for old nevrax pixel program code, marked todos in comments
--HG--
branch : multipass-stereo
|
2013-06-19 02:01:12 +02:00 |
|
kaetemi
|
983fab378c
|
Add rest of the diff from the old nevrax code for pixel programs to NL3D
--HG--
branch : multipass-stereo
|
2013-06-19 01:38:23 +02:00 |
|
kaetemi
|
ef720f764f
|
Removed some CEffect related bit that slipped in
--HG--
branch : multipass-stereo
|
2013-06-19 01:22:26 +02:00 |
|
kaetemi
|
3927378399
|
Add diff from old nevrax pixel program code to IDriver, CEffect related code not included
--HG--
branch : multipass-stereo
|
2013-06-19 01:20:51 +02:00 |
|
kaetemi
|
7be5858010
|
Simplify CPixelProgram
--HG--
branch : multipass-stereo
|
2013-06-19 01:19:45 +02:00 |
|
kaetemi
|
16d47d742f
|
Add some files from old nevrax shader code for exposing pixel programs in the drivers
--HG--
branch : multipass-stereo
|
2013-06-19 01:14:30 +02:00 |
|
kaetemi
|
f63a275f2b
|
Backed out changeset ea4b76b7213a, bad approach
--HG--
branch : multipass-stereo
|
2013-06-19 01:03:20 +02:00 |
|
kaetemi
|
c7994bb11f
|
Allow rendering with bloom to a user provided render target (untested) (#43)
--HG--
branch : multipass-stereo
|
2013-06-17 00:45:17 +02:00 |
|
kaetemi
|
c7a9edd495
|
Remove silly heap allocation of a null pointer
--HG--
branch : multipass-stereo
|
2013-06-16 23:49:45 +02:00 |
|
kaetemi
|
87c30bceea
|
Add info structure for multipass camera rendering effects #43
--HG--
branch : multipass-stereo
|
2013-06-16 20:48:17 +02:00 |
|
kaetemi
|
3b9f934b82
|
Fixes to compile Ryzom Client with lua 5.2
|
2013-06-16 03:43:45 +02:00 |
|
kaetemi
|
d139185b1e
|
Compile NLGUI with lua 5.2
|
2013-06-16 02:33:04 +02:00 |
|
kervala
|
30d56b7c24
|
Added: CMake project for shape2obj
|
2013-06-10 15:48:10 +02:00 |
|
liria
|
487799cbf5
|
kervala's enhancements and fixes for the Windows compilation.
--HG--
branch : ig_elevaton_port_to_linux
|
2013-06-09 15:55:59 +02:00 |
|
liria
|
6b750cf042
|
FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows.
--HG--
branch : ig_elevaton_port_to_linux
|
2013-06-08 16:15:41 +02:00 |
|
liria
|
46d99e4a6d
|
FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows with using conditional compilation.
--HG--
branch : ig_elevaton_port_to_linux
|
2013-06-08 15:38:04 +02:00 |
|
liria
|
99efdb2a23
|
FIXE: replace the WIN32 API for directories manipulation by the the POSIX API to compile with linux.
--HG--
branch : ig_elevaton_port_to_linux
|
2013-06-08 14:39:30 +02:00 |
|
dfighter1985
|
cfc78bd614
|
FIXED: GUI not showing up because of the interface user functions not getting registered, because of a file linking issue.
|
2013-06-05 03:29:34 +02:00 |
|
dfighter1985
|
f382b97f74
|
Making GCC happy.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-15 01:54:35 +02:00 |
|
dfighter1985
|
b29fd5ca11
|
Editbox should now create it's text when added.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-11 02:40:55 +02:00 |
|
dfighter1985
|
2faff4dfaa
|
Inconsistent line ending style, according to VS. How it managed to do this is a mystery tho.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-10 22:35:04 +02:00 |
|
dfighter1985
|
b49a6ca04d
|
Added some defaults.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-10 22:29:47 +02:00 |
|
dfighter1985
|
25195fce4c
|
The editor probably shouldn't crash when adding textbutton widget.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-10 02:10:18 +02:00 |
|
dfighter1985
|
9042de4ab2
|
Make sure to apply the changes, when changing properties.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-10 00:55:23 +02:00 |
|
dfighter1985
|
057960d056
|
Forgot to set the parent.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-10 00:28:29 +02:00 |
|
dfighter1985
|
337f93a233
|
When adding a new widget, the correct widget is now instantiated. Also added some checks.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-09 23:57:48 +02:00 |
|
dfighter1985
|
142bc623c9
|
Some more work for widget adding support. Basically the system works, just need to make sure the proper widget is instantiated, and the defaults are loaded ( so it shows up ).
--HG--
branch : gsoc2012-gui-editor
|
2013-05-09 05:53:14 +02:00 |
|
dfighter1985
|
45f5d6cc0d
|
Added some more checks, signal and slots related to widget adding.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-05 05:49:35 +02:00 |
|
dfighter1985
|
c91e7492bb
|
Added GUI for widget adding.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-05 04:58:15 +02:00 |
|
dfighter1985
|
a0af49fd40
|
Merged default.
--HG--
branch : gsoc2012-gui-editor
|
2013-05-04 22:28:31 +02:00 |
|
Dzmitry Kamiahin
|
68fe576f01
|
Fixed self-comparsion in ps.
|
2013-05-04 01:57:53 +03:00 |
|
dfighter1985
|
67a24bb1b0
|
Merged default
--HG--
branch : gsoc2012-gui-editor
|
2013-05-03 02:07:38 +02:00 |
|
sfb
|
1bfba35cd0
|
merge
|
2013-05-02 14:38:49 -05:00 |
|
kaetemi
|
76a7df820b
|
This should fix #41. It was creating the unknown for the new type and then returning a new sheet for the requested unknown
|
2013-05-02 21:37:15 +02:00 |
|
sfb
|
2bf56882f8
|
merge
|
2013-05-02 14:34:40 -05:00 |
|
sfb
|
8fe6eee93c
|
fixed #40 with an explicit static_cast.
|
2013-05-02 14:31:10 -05:00 |
|
dfighter1985
|
bdfa7dbc37
|
Don't build GUI Editor when not building the GUI library.
|
2013-05-02 20:19:35 +02:00 |
|
kervala
|
2aea567fe2
|
Changed: Moved Ryzom detailed version in client
|
2013-04-29 14:46:53 +02:00 |
|
kervala
|
0624da9c82
|
Changed: Added a new event EventCloseWindowId when system reports window should be closed
|
2013-04-29 11:15:14 +02:00 |
|
kervala
|
381eeaef8a
|
Fixed: Virtual destructor warning
|
2013-04-29 10:41:34 +02:00 |
|
kervala
|
9aff9ae939
|
Fixed: PCH compilation
|
2013-03-31 23:36:56 +02:00 |
|
kervala
|
0c2e2d3e8f
|
fixes #32 build failure/error using clang
|
2013-03-26 13:56:16 +01:00 |
|
kervala
|
3aee7c3ac8
|
fixes a warning
|
2013-03-24 20:16:53 +01:00 |
|
kervala
|
ab454f3d92
|
fixes #31 Luabind can't be found
Added PCH support to NeL GUI
|
2013-03-24 20:16:23 +01:00 |
|
dfighter1985
|
d2fd01393f
|
Merging default.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-12 07:17:04 +01:00 |
|
dfighter1985
|
526da8ddf8
|
MODIFIED: no more action handler spam.
|
2013-03-12 07:16:16 +01:00 |
|
dfighter1985
|
7aee088634
|
FIXED: Deleting the CViewText of CCtrlTextButton should no longer lead to crashes.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-10 00:56:27 +01:00 |
|
dfighter1985
|
b6970c54ae
|
MODIFIED: Ups, missed this.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-09 22:31:51 +01:00 |
|
dfighter1985
|
df834e0584
|
FIXED: Widgets will no longer get stuck in the widget hierarchy tree, when deleting their parent.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-09 22:02:31 +01:00 |
|
dfighter1985
|
20820697a3
|
FIXED: It's not nice to leak memory.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-09 20:58:53 +01:00 |
|
dfighter1985
|
363154e241
|
MODIFIED: Preliminary support for a little cleanup when removing a widget from it's parent group ( for example when moving the widget ).
--HG--
branch : gsoc2012-gui-editor
|
2013-03-08 06:28:52 +01:00 |
|
dfighter1985
|
660fb00895
|
MODIFIED: Widgets derived from CInterfaceGroup should now be deleted too properly.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-08 06:07:21 +01:00 |
|
dfighter1985
|
aa2affa158
|
MODIFIED: Draw the highlight of the currently selected widget in editor mode.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-07 06:01:33 +01:00 |
|
dfighter1985
|
532a3ef7d3
|
MODIFIED: collapse the widget hierarchy tree and remove the widget from it when it's deleted. Also clear the widget properties panel.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-03 03:49:56 +01:00 |
|
dfighter1985
|
b80c47cc10
|
MODIFIED: Somehow I left this here, and it prevented viewtexts from being selected.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-03 00:54:22 +01:00 |
|
dfighter1985
|
48d50cb409
|
MODIFIED: Text buttons will now delete their text too when being deleted.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-02 23:27:17 +01:00 |
|
dfighter1985
|
026ccfcd13
|
MODIFIED: GUI Editor can now delete widgets.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-02 06:57:40 +01:00 |
|
dfighter1985
|
29ef7af61a
|
MODIFIED: When selecting a widget in the central widget, the hierarchy tree should now be updated as well.
--HG--
branch : gsoc2012-gui-editor
|
2013-03-02 03:24:22 +01:00 |
|
dfighter1985
|
365ef61ec9
|
MODIFIED: Update property browser when selecting in the central widget.
--HG--
branch : gsoc2012-gui-editor
|
2013-02-23 06:55:19 +01:00 |
|
dfighter1985
|
3a7f25bc79
|
MODIFIED: Views can now be selected too from the central widget.
--HG--
branch : gsoc2012-gui-editor
|
2013-02-23 00:13:44 +01:00 |
|