Commit graph

655 commits

Author SHA1 Message Date
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
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
5e14dc4458 Update veget implementation
--HG--
branch : multipass-stereo
2013-09-13 17:09:05 +02:00
kaetemi
c6139419ac Partial update of veget vp
--HG--
branch : multipass-stereo
2013-09-10 19:52:14 +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
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
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
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
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
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
Thibaut Girka
ea8a845ab9 Add support for LibVR
--HG--
branch : multipass-stereo
2013-08-28 08:08:22 +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
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
1e9771d054 Merge with default
--HG--
branch : multipass-stereo
2013-07-25 00:37:00 +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
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
kaetemi
b1aaf05bf6 Init/release VR interfaces in ryzom client, ref #43
--HG--
branch : multipass-stereo
2013-07-05 02:04:34 +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
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
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
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
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
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
3e91b1a5cf Test texture with postprocessing material, seems to work with opengl
--HG--
branch : multipass-stereo
2013-06-19 20:47:23 +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
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
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
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
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
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
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
0c2e2d3e8f fixes #32 build failure/error using clang 2013-03-26 13:56:16 +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
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
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
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
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
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
dfighter1985
fe456d91b6 GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 2013-02-20 22:05:09 +01:00
mattraykowski
6e309fee7a changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
ecbcdf388f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
e7e51f01e0 merging gui editor repo. 2013-02-14 09:53:06 -06:00
dfighter1985
fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 10:47:10 +01:00
kervala
4f8b62acb4 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:35:51 +01:00
kervala
6e498aefad Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
3416ec2824 Changed: Warnings with clang 2013-02-08 18:17:42 +01:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
kervala
5efeb5ba62 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
c8172d233c Changed: PCH optimizations 2012-12-11 11:59:54 +01:00
kervala
41f4cf2979 Fixed: Include libxml2 header 2012-12-08 13:13:00 +01:00
kervala
7f4ac72ef3 Changed: Minor typos 2012-12-08 12:07:23 +01:00
kervala
4daf3bd009 Changed: Compilation with PCH optimizations 2012-12-08 11:32:31 +01:00
kervala
439266544e Changed: Compilation with VC++ 2012 2012-12-08 11:28:46 +01:00
kervala
6ee416badf Changed: Minor typos 2012-12-03 09:09:31 +01:00
dfighter1985
cb13ce46cd MODIFIED: #1471 Merged mainline default to this branch.
--HG--
branch : gsoc2012-gui-editor
2012-11-25 05:22:40 +01:00
kervala
08f2b93b94 Changed: VC++ 2012 partial support 2012-11-24 20:26:55 +01:00
kervala
b7be696848 Move all PACS headers in nel/include/pacs directory (fixes #2) 2012-10-28 11:55:21 +01:00
kervala
0d782993f9 Fixed #1: Implement anisotropic filtering for textures 2012-10-27 17:46:13 +02:00
dfighter1985
d83c375981 CHANGED: #1471 GUI library will now build with the new externals and Visual Studio 2010.
--HG--
branch : gsoc2012-gui-editor
2012-10-24 18:16:01 +02:00
kervala
152df7402b Changed: Updated description for CBitmap::load and CBitmap::loadSize 2012-10-06 15:49:27 +02:00
kervala
0795a61516 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
dfighter1985
e620f725c3 CHANGED: #1471 CCtrlBaseButton action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing.
--HG--
branch : gsoc2012-gui-editor
2012-08-20 01:29:49 +02:00
dfighter1985
a0559ee680 CHANGED: #1471 Keys are now parsed from the config files, and then serialized on save.
--HG--
branch : gsoc2012-gui-editor
2012-08-18 20:28:56 +02:00
dfighter1985
c532f23ac1 CHANGED: #1471 Pointer settings are now parsed even when the particular pointer cannot be instantiated. They are also serialized when serializing the GUI.
--HG--
branch : gsoc2012-gui-editor
2012-08-18 18:39:45 +02:00
dfighter1985
0d4c4cd56d CHANGED: #1471 Should be able to change text options for CCtrlTextButton.
--HG--
branch : gsoc2012-gui-editor
2012-08-18 03:37:52 +02:00
dfighter1985
caa024b0be CHANGED: #1471 Serialize text options for Buttons with text too.
--HG--
branch : gsoc2012-gui-editor
2012-08-18 02:46:19 +02:00
dfighter1985
91368514b6 CHANGED: #1471 GUI Procedures are now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-17 21:49:54 +02:00
dfighter1985
87001d8ff1 CHANGED: #1471 Links are now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-17 20:36:35 +02:00
dfighter1985
4ae34c1844 CHANGED: #1471 Variables are now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-17 06:10:18 +02:00
dfighter1985
503b9c4234 CHANGED: #1471 Tree/node data is now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-17 04:37:07 +02:00
dfighter1985
180f86694d CHANGED: #1471 interface options are now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-16 00:45:19 +02:00
dfighter1985
c554c90fbe CHANGED: #1471 Widgets can now be flagged as non-serializable, in which case they won't be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-15 16:35:21 +02:00
dfighter1985
875f8814b7 CHANGED: #1471 CGroupContainer fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 21:02:20 +02:00
dfighter1985
f3cdb18f74 CHANGED: #1471 CGroupTab fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 19:43:43 +02:00
dfighter1985
d0f94ade15 CHANGED: #1471 CDBGroupSelectNumber fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 19:29:20 +02:00
dfighter1985
8a33e0ea9f CHANGED: #1471 CDBGroupComboBox fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 18:43:21 +02:00
dfighter1985
005afd7aab CHANGED: #1471 CGroupHTML fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 09:22:24 +02:00
dfighter1985
5371a77486 CHANGED: #1471 CGroupScrollText fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 02:10:27 +02:00
dfighter1985
4c9ab0ac63 CHANGED: #1471 CGroupParagraph fields can now we serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:33:54 +02:00
dfighter1985
a390b90ee0 CHANGED: #1471 CGroupHeader fields can now we serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:22:49 +02:00
dfighter1985
7d12259197 CHANGED: #1471 CGroupList fields can now we serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:20:14 +02:00
dfighter1985
7dfb60bd0c CHANGED: #1471 CGroupHTMLInputOffset fields can now we serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:10:14 +02:00
dfighter1985
42b4eae629 CHANGED: #1471 CGroupWheel fields can now we serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 00:59:29 +02:00
dfighter1985
7547c5aa88 CHANGED: #1471 CGroupHeaderEntry fields can now we serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-14 00:53:47 +02:00