Commit graph

710 commits

Author SHA1 Message Date
kaetemi
6a21d0503c 3D: Cleanup bloom effect
--HG--
branch : multipass-stereo
2014-08-03 21:09:55 +02:00
kaetemi
8af686f7ef 3D: Cleanup bloom effect
--HG--
branch : multipass-stereo
2014-08-03 20:35:05 +02:00
kervala
7aedffce9a Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up) 2014-08-02 11:18:24 +02:00
kaetemi
c11706feb8 Project GUI into space
--HG--
branch : multipass-stereo
2014-08-01 15:44:12 +02:00
kaetemi
caefb04928 Restore camera and scene viewport after disabling VR
--HG--
branch : multipass-stereo
2014-08-01 13:20:55 +02:00
kaetemi
79c6f50054 Render target format (for alpha)
--HG--
branch : multipass-stereo
2014-07-31 18:25:50 +02:00
kaetemi
22d03c5f79 Mode2D selection
--HG--
branch : multipass-stereo
2014-07-31 03:53:38 +02:00
kaetemi
dac5b2d274 Merge with game-device
--HG--
branch : multipass-stereo
2014-07-31 02:07:20 +02:00
kaetemi
b1e2b60381 Add render target manager, issue #47
--HG--
branch : multipass-stereo
2014-07-31 00:46:00 +02:00
dfighter1985
431178321f TileBank loading.
--HG--
branch : gsoc2014-dfighter
2014-07-30 10:54:08 +02:00
dfighter1985
8373118c7e Merged default.
--HG--
branch : gsoc2014-dfighter
2014-07-22 00:15:50 +02:00
KISHAN GRIMOUT
b9dc8ace7e fix windows 64-bit crash in client due to VS 64-bit compiler bug, fix #164 2014-07-16 13:47:08 +02:00
kaetemi
176c3d8a4a Add callback template class
--HG--
branch : develop
2014-07-12 18:19:25 +02:00
kaetemi
7487ea4135 Higher quality outline, visual difference is relevant only for black
--HG--
branch : develop
2014-10-16 02:00:45 +02:00
kaetemi
496f7f268c Trash DirectInput
--HG--
branch : game-device
2014-07-12 17:17:24 +02:00
dfighter1985
012ad96806 Texture chooser now supports atlas textures as well.
--HG--
branch : gsoc2014-dfighter
2014-07-09 21:07:12 +02:00
kaetemi
e729a9d035 Fix #162: Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
kaetemi
f281622d47 Trash DirectInput
--HG--
branch : game-device
2014-07-08 22:21:11 +02:00
dfighter1985
fe58435bb5 CPath can now return the file list with a path filter.
--HG--
branch : gsoc2014-dfighter
2014-07-06 23:21:25 +02:00
dfighter1985
085c1b41b9 Added facilities for viewing the loaded actions.
--HG--
branch : gsoc2014-dfighter
2014-07-02 22:27:04 +02:00
dfighter1985
842ca366de Tooltip posrefs are now enums in the GUI Editor.
--HG--
branch : gsoc2014-dfighter
2014-06-29 01:44:06 +02:00
kaetemi
655c22e839 Fix compile 2014-06-20 23:24:54 +02:00
kaetemi
43a061bebd SSE2: Compile fix
--HG--
branch : sse2
2014-06-20 03:08:51 +02:00
kaetemi
6734852fa3 SSE2: Ensure correct allocator is used
--HG--
branch : sse2
2014-06-14 00:38:35 +02:00
kaetemi
71a598db7e SSE2: Remove dead code
--HG--
branch : sse2
2014-06-13 22:21:07 +02:00
kaetemi
848932f93a SSE2: Fix for MinGW
--HG--
branch : sse2
2014-06-19 00:05:43 +02:00
kaetemi
ac3e69b8ab Merge with default
--HG--
branch : sse2
2014-06-20 03:01:32 +02:00
kaetemi
b18203fc4e Fix Ryzom server compile under MinGW 2014-06-19 20:19:39 +02:00
kaetemi
43be0fd2a5 Fix D3D driver compile under MinGW 2014-06-18 16:29:02 +02:00
kaetemi
75f7b9f931 Fix Snowballs service compile under MinGW 2014-06-18 12:52:03 +02:00
kaetemi
f4fd8bb669 Fix linking of OpenGL driver under MinGW 2014-06-18 01:21:05 +02:00
kaetemi
3dd11fe157 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
f6ad306a57 SSE2: Add macro for force inline
--HG--
branch : sse2
2014-06-13 20:25:45 +02:00
kaetemi
d3fb390cf3 SSE2: Align CMatrix
--HG--
branch : sse2
2014-06-13 19:33:09 +02:00
kaetemi
556a41afee SSE2: Implement alignment for arena allocator
--HG--
branch : sse2
2014-06-13 19:26:22 +02:00
kaetemi
eee9ba0cae SSE2: Add aligned allocators
--HG--
branch : sse2
2014-06-13 19:12:31 +02:00
kaetemi
1a4a7bafab Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kaetemi
798d207d0d Fix EOL 2014-04-30 12:53:06 +02:00
dfighter1985
4abf74d6e9 We can now drag elements, they will disappear and whatnot, but at least they can be dragged!
--HG--
branch : gui-editor
2014-04-21 19:30:33 +02:00
dfighter1985
e12d189d51 Refactored input event handling a bit.
--HG--
branch : gui-editor
2014-04-20 21:41:57 +02:00
dfighter1985
41f44b2aa6 Merge default.
--HG--
branch : gsoc2012-gui-editor
2014-04-19 21:53:29 +02:00
kaetemi
5ed5cd5ea8 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
62eb6347e5 Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kaetemi
40fe633dbe Fix thread lockup in zone lighter
--HG--
branch : build_pipeline_py
2014-02-07 02:01:23 +01:00
kaetemi
89a2a2ce99 Do not select stereo display debugger when HMD is set to Auto in Snowballs 2014-02-04 20:52:15 +01:00
kaetemi
bcb2f48940 Remove georges4cvs feature 2014-02-03 00:16:35 +01:00
kervala
c9a9839ce6 Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1) 2014-01-30 16:14:25 +01:00
kervala
1c50b1f943 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
Nimetu
4c2531474a Fix typo (issue #70)
--HG--
branch : misc-patches
2014-01-03 19:51:50 +02:00
kervala
b219623129 Fixed: Verbose warning 2013-11-13 22:23:57 +01:00
kervala
dda2215ed8 Fixed: Wrong algorithm 2013-11-13 21:46:42 +01:00
kervala
6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kaetemi
ce9e0a397b Fix regression from stereo branch in wind tree 2013-09-14 18:58:23 +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
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