Commit graph

815 commits

Author SHA1 Message Date
dfighter1985
6c05ced558 Added support for grouping widgets. 2014-10-11 00:42:43 +02:00
dfighter1985
0aead6db70 Allow multiselection. 2014-10-10 20:25:25 +02:00
kervala
e4ab2467c1 Minor changes 2014-10-10 13:08:14 +02:00
kaetemi
a1262b71b2 Handle shadow outline in gui 2014-10-08 23:20:35 +02:00
kaetemi
523761d7b7 Implement text shade outline 2014-10-08 23:20:34 +02:00
dfighter1985
733fb56703 A little crash fix. 2014-10-08 21:28:20 +02:00
dfighter1985
003ddd6881 Added support for ungrouping. 2014-10-08 20:36:16 +02:00
dfighter1985
e9f5fef158 Make group selection optional. 2014-10-08 18:45:17 +02:00
dfighter1985
1111a022af When moving a group draw it's children too. 2014-10-08 17:52:56 +02:00
kaetemi
6ec644e2ba Fix rendering of specially sized window highlights 2014-10-08 09:31:13 +02:00
kaetemi
cbe5cb66f7 Add inset_t parameter to layer options, allows putting header graphics in top texture 2014-10-04 01:43:27 +02:00
dfighter1985
7504dc1238 From now on dragged widgets will be re-aligned on drop. They will find the nearest hotspot of the group they are dropped into, and calculate an offset so they will align to the hotspot and yet remain where they were dropped. 2014-09-29 20:29:04 +02:00
dfighter1985
e87d83bccc Refactoring. Added CInterfaceFactory. 2014-09-27 21:48:51 +02:00
dfighter1985
fada6e7dcc A little refactoring. 2014-09-27 20:15:46 +02:00
dfighter1985
75047b71b4 Move the text too with the text button. 2014-09-27 19:54:19 +02:00
Nimetu
2b02fd2c37 Add maxlength attribute to input and textarea tags 2014-09-27 15:55:57 +03:00
dfighter1985
e6f4801129 Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves. 2014-09-24 23:32:24 +02:00
dfighter1985
f7825fc8b3 No need for free floating elements when we can simply reparent to the top window... 2014-09-24 22:59:40 +02:00
dfighter1985
f30054a26c Add widget to a new parent when the widget being dragged is dropped, otherwise add it to the orphanlist so that it's drawn anyways. NOTE: The dropped widget can be clipped. If it is clipped, it never shows up even tho it's there. 2014-09-24 18:45:52 +02:00
dfighter1985
574d24e5e3 Dragged elements will no longer disappear. 2014-09-24 16:20:25 +02:00
dfighter1985
e40ecbda00 Merged the gui-editor branch. 2014-09-17 21:12:14 +02:00
kaetemi
302c478af6 Merge with develop 2014-09-12 15:19:12 +02:00
kaetemi
b34c7cf12a When in Rome, do as the Romans do 2014-09-11 10:36:41 +02:00
dfighter1985
15f6ed3c37 Merged default. 2014-09-05 22:28:11 +02:00
dfighter1985
ca910cf17a Added support for manipulating atoms. 2014-09-05 20:28:43 +02:00
kervala
ad5cc68107 Changed: Code formatting 2014-09-05 15:42:53 +02:00
dfighter1985
a875e66696 Implemented add and remove buttons. 2014-09-02 19:26:02 +02:00
dfighter1985
2292fc96c4 Apply changes. 2014-09-02 14:54:07 +02:00
kervala
5e8c5d2102 Changed: Including malloc/malloc.h is useless 2014-08-27 11:21:47 +02:00
kervala
05be67e263 Fixed: Compilation under Mac OS X (malloc is already aligned on 16 bytes and memalign doesn't exist) 2014-08-27 11:16:30 +02:00
kaetemi
0f236b800f Merge with default 2014-08-19 15:43:49 +02:00
dfighter1985
e59fb841bc Merged default. 2014-08-19 00:33:03 +02:00
kervala
4f4a3469d3 Fixed #172 XML floating point serialization not using neutral culture 2014-08-17 15:39:30 +02:00
kaetemi
f731d220d7 Project client loading screens into 3D space for HMD 2014-08-07 18:49:05 +02:00
kaetemi
60c4e36fec Clean handling of display mode switching in client 2014-08-07 04:36:51 +02:00
kaetemi
7bd9216a6f Specify monitor when changing display mode 2014-08-07 01:04:58 +02:00
dfighter1985
04095561cb Merge default 2014-08-07 00:03:09 +02:00
kaetemi
7db83ce7da Process some scene traversals only once when rendering in stereo 2014-08-06 14:36:09 +02:00
kaetemi
031f1cdcbd OVR: Convert texture coordinates and setup rendering material 2014-08-05 03:54:19 +02:00
dfighter1985
cc12fb91b4 Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes. 2014-08-05 02:58:31 +02:00
kaetemi
19209b8028 OVR: Test distortion mesh 2014-08-05 02:55:26 +02:00
kaetemi
240889b03d 3D: Render target matrix context fix 2014-08-05 02:21:30 +02:00
kaetemi
fb16438a49 OVR: Testing 2014-08-05 01:49:45 +02:00
kaetemi
4a8d07b889 OVR: Translate camera 2014-08-05 00:51:53 +02:00
kaetemi
30f98c4b62 OVR: Get orientation 2014-08-05 00:46:04 +02:00
kaetemi
2dda6cc5f0 OVR: Generate distortion mesh 2014-08-05 00:20:21 +02:00
kaetemi
c99cfed0dd OVR: Read device descriptions 2014-08-04 20:32:31 +02:00
kaetemi
05a2f91711 OVR: Iterate devices 2014-08-04 19:19:15 +02:00
kaetemi
0baada5110 Cleanup 2014-08-04 18:31:31 +02:00
kaetemi
ca165de62c Add placeholders for LibOVR 0.4.0 support 2014-08-04 18:30:25 +02:00
kaetemi
650e634e68 3D: Add FXAA 2014-08-04 04:44:27 +02:00
kaetemi
5e9fc17402 Move default render target handling to CDriverUser 2014-08-04 00:57:43 +02:00
kaetemi
8c6d46bed0 Adjust render target handling for effects 2014-08-03 22:15:44 +02:00
kaetemi
996dd9aa16 Merge with default 2014-08-03 22:15:39 +02:00
dfighter1985
80f7dd725d Started to rework tile checks, tile banks loading / saving. A tilebank will now be in the tilemodel, and it will work from there. Also moved some constants into an independent file. 2014-08-03 21:33:13 +02:00
kaetemi
f03f73e5c8 3D: Cleanup bloom effect 2014-08-03 21:09:55 +02:00
kaetemi
2bccba1ddc 3D: Cleanup bloom effect 2014-08-03 20:35:05 +02:00
kervala
5f5f0dd76c Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up) 2014-08-02 11:18:24 +02:00
kaetemi
9e23a689ae Project GUI into space 2014-08-01 15:44:12 +02:00
kaetemi
0adb5be855 Restore camera and scene viewport after disabling VR 2014-08-01 13:20:55 +02:00
kaetemi
655d709ceb Render target format (for alpha) 2014-07-31 18:25:50 +02:00
kaetemi
029d9bddfe Mode2D selection 2014-07-31 03:53:38 +02:00
kaetemi
a6812f5844 Merge with game-device 2014-07-31 02:07:20 +02:00
kaetemi
64666c302a Add render target manager, issue #47 2014-07-31 00:46:00 +02:00
dfighter1985
e82ffc9b14 TileBank loading. 2014-07-30 10:54:08 +02:00
dfighter1985
8971f98722 Merged default. 2014-07-22 00:15:50 +02:00
KISHAN GRIMOUT
77d1f8e4bc 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
b24f979569 Add callback template class 2014-07-12 18:19:25 +02:00
kaetemi
dc17e72ad3 Higher quality outline, visual difference is relevant only for black 2014-10-16 02:00:45 +02:00
kaetemi
18ade6cbd4 Trash DirectInput 2014-07-12 17:17:24 +02:00
dfighter1985
2ca6c73d09 Texture chooser now supports atlas textures as well. 2014-07-09 21:07:12 +02:00
kaetemi
3650ef83b7 Fix #162: Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
kaetemi
0f5f1f9047 Trash DirectInput 2014-07-08 22:21:11 +02:00
dfighter1985
c736145c2f CPath can now return the file list with a path filter. 2014-07-06 23:21:25 +02:00
dfighter1985
668bbc1780 Added facilities for viewing the loaded actions. 2014-07-02 22:27:04 +02:00
dfighter1985
5deea1a13b Tooltip posrefs are now enums in the GUI Editor. 2014-06-29 01:44:06 +02:00
kaetemi
a6195bcee7 Fix compile 2014-06-20 23:24:54 +02:00
kaetemi
39894f4a99 SSE2: Compile fix 2014-06-20 03:08:51 +02:00
kaetemi
92d00936aa SSE2: Ensure correct allocator is used 2014-06-14 00:38:35 +02:00
kaetemi
f51843a721 SSE2: Remove dead code 2014-06-13 22:21:07 +02:00
kaetemi
56c59d114d SSE2: Fix for MinGW 2014-06-19 00:05:43 +02:00
kaetemi
b9576c93dd Merge with default 2014-06-20 03:01:32 +02:00
kaetemi
00528e1cd6 Fix Ryzom server compile under MinGW 2014-06-19 20:19:39 +02:00
kaetemi
a4c86ddf20 Fix D3D driver compile under MinGW 2014-06-18 16:29:02 +02:00
kaetemi
a47d71713f Fix Snowballs service compile under MinGW 2014-06-18 12:52:03 +02:00
kaetemi
275f18d6ab Fix linking of OpenGL driver under MinGW 2014-06-18 01:21:05 +02:00
kaetemi
5b47ca4709 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
0420fea931 SSE2: Add macro for force inline 2014-06-13 20:25:45 +02:00
kaetemi
7929f78dd7 SSE2: Align CMatrix 2014-06-13 19:33:09 +02:00
kaetemi
78ccdb16b7 SSE2: Implement alignment for arena allocator 2014-06-13 19:26:22 +02:00
kaetemi
12c636d747 SSE2: Add aligned allocators 2014-06-13 19:12:31 +02:00
kaetemi
c93b04df1d Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kaetemi
989965e33f Fix EOL 2014-04-30 12:53:06 +02:00
dfighter1985
916c9bf919 We can now drag elements, they will disappear and whatnot, but at least they can be dragged! 2014-04-21 19:30:33 +02:00
dfighter1985
83e0c1ceda Refactored input event handling a bit. 2014-04-20 21:41:57 +02:00
dfighter1985
8c23925246 Merge default. 2014-04-19 21:53:29 +02:00
kaetemi
9edd54c446 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
b118643bbd Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kaetemi
9dce6793b2 Fix thread lockup in zone lighter 2014-02-07 02:01:23 +01:00
kaetemi
7989e9e6bc Do not select stereo display debugger when HMD is set to Auto in Snowballs 2014-02-04 20:52:15 +01:00
kaetemi
ce88e5836a Remove georges4cvs feature 2014-02-03 00:16:35 +01:00
kervala
62e62d2e72 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
37d36e0ab5 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
Nimetu
f26e595ad3 Fix typo (issue #70) 2014-01-03 19:51:50 +02:00
kervala
925a97ad85 Fixed: Verbose warning 2013-11-13 22:23:57 +01:00
kervala
0b400ae0c2 Fixed: Wrong algorithm 2013-11-13 21:46:42 +01:00
kervala
df8c6e9b08 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kaetemi
adcb3e032b Fix regression from stereo branch in wind tree 2013-09-14 18:58:23 +02:00
kaetemi
4adbfd4e4e Update supportVertexProgram calls 2013-09-14 16:43:36 +02:00
kaetemi
7967709e0e Remove old interface 2013-09-14 16:45:00 +02:00
kaetemi
102f0080af Cleanup unused code 2013-09-14 16:23:11 +02:00
kaetemi
0386673d13 Rename 2013-09-14 00:46:10 +02:00
kaetemi
08f37643b7 Cleanup 2013-09-14 00:36:06 +02:00
kaetemi
93b5536036 Merge with default 2013-09-13 23:24:13 +02:00
kaetemi
4f193231a1 Fix compile errors caused by missing includes 2013-09-13 23:23:19 +02:00
kaetemi
edec14807f Use named uniform indices for lighted vertex program 2013-09-13 21:31:47 +02:00
kaetemi
a0fbb152ee Updated wind tree program container 2013-09-13 20:45:06 +02:00
kaetemi
ba945f30a8 Use lighted vertex program container for per pixel light program 2013-09-13 20:00:20 +02:00
kaetemi
482c13fd1a Add container for lighted vertex program 2013-09-13 19:03:05 +02:00
kaetemi
2f384d9789 Update veget implementation 2013-09-13 17:09:05 +02:00
kaetemi
a798aecd71 Partial update of veget vp 2013-09-10 19:52:14 +02:00
kaetemi
26f4073ad7 Simplify 2013-09-10 15:59:31 +02:00
kaetemi
4de5eeb586 Adjust landscape vertex program to use new interface 2013-09-10 15:42:42 +02:00
kaetemi
32288eabe8 Use new program interface for water vertex program 2013-09-10 02:07:16 +02:00
kaetemi
c9a2f9dbfc Some fixes 2013-09-10 01:29:53 +02:00
kaetemi
680f260803 Use CSmartPtr for vertex program 2013-09-10 00:31:26 +02:00
kaetemi
f46ef4fd07 Fix incorrectly removed line 2013-09-09 23:03:52 +02:00
kaetemi
b6fde3c706 Missed file in last commit 2013-09-09 23:01:43 +02:00
kaetemi
1447e2f2d8 Replace temporary CMaterial code 2013-09-09 21:44:14 +02:00
kaetemi
0bcb0d6ffd Add glsl pixel program for stereo distortion 2013-09-09 20:49:59 +02:00
kaetemi
057eab4680 Cleanup abstract gpu program interface 2013-09-09 18:33:38 +02:00
kaetemi
99a48d5511 Implement new driver interface in OpenGL driver 2013-09-09 14:43:10 +02:00
kaetemi
ea25e5375d Expand parameter interface 2013-09-09 12:18:20 +02:00
kaetemi
0cf5dbab8a Reduce function duplication 2013-09-09 02:03:40 +02:00
kaetemi
060bd3035e Builtin parameter set functions 2013-09-09 01:53:02 +02:00
kaetemi
c512dfbb3d Separate count and size 2013-09-09 01:31:15 +02:00
kaetemi
7be6891bd7 Cleanup driver interface 2013-09-08 21:57:27 +02:00
kaetemi
48493b225d Add additional set functions 2013-09-08 01:49:34 +02:00
kaetemi
58a8982ba5 Add gpu program params storage structure 2013-09-08 01:36:01 +02:00
kaetemi
f4d05d25c5 Implement new gpu program interface in direct3d driver 2013-09-07 22:00:07 +02:00
kaetemi
f4fccab548 Implement new gpu program interface in opengl driver 2013-09-07 21:30:40 +02:00
kaetemi
47716d7247 Make gpu programs use abstract gpu program class 2013-09-07 20:41:07 +02:00
kaetemi
d54774f978 Add abstract gpu program and source classes 2013-09-07 18:33:18 +02:00
Thibaut Girka
a45299bfe5 Add support for LibVR 2013-08-28 08:08:22 +02:00
kaetemi
9dc9acd68f Merge with default 2013-08-01 23:02:49 +02:00
kaetemi
bbe4ea4ba8 Add some basic prediction to CCDBNodeBranch::find 2013-08-01 22:47:46 +02:00
kaetemi
b09e28e9e0 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 2013-07-28 05:10:07 +02:00
kaetemi
70f83e1fb9 Parse action handler condition for interface link in advance 2013-07-28 03:02:07 +02:00
kaetemi
36c969252b Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager 2013-07-28 00:48:34 +02:00
kaetemi
fd285cc703 Merge with default 2013-07-25 00:37:00 +02:00
kervala
bd8a606341 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 2013-07-24 18:47:04 +02:00
Michael Witrant
59dc1a6c16 Fixed definition tests for optional LibOVR 2013-07-06 20:40:42 +02:00
Michael Witrant
69c194f57f LibOVR is optional, and is disabled by default 2013-07-06 20:05:19 +02:00
kaetemi
541f75920b Init/release VR interfaces in ryzom client, ref #43 2013-07-05 02:04:34 +02:00
kaetemi
4b2ea661cc Fix particles being animated twice in stereo render, see #43 2013-07-04 00:42:06 +02:00
kaetemi
fd1d606154 Add stereo debugger for visually comparing rendered frames, ref #43 2013-07-04 00:09:10 +02:00
kaetemi
a531535dfa Add minimal head model and world scale, ref #43 2013-07-03 05:21:32 +02:00
kaetemi
299b3ec401 Make bloom work together with render target used for the rift shader, ref #43 2013-07-03 03:53:32 +02:00
kaetemi
9516851bee Remove unnecessary user render target code from bloom, see #43 2013-07-03 03:21:57 +02:00
kaetemi
a924479a5c Render left and right deformed view, re #43 2013-07-02 03:34:49 +02:00
kaetemi
6b8d43181d Test the barrel shader, see #43 2013-07-02 02:40:27 +02:00
kaetemi
3a12aa5894 Render the scene to a target texture for the stereo rendering filter, ref #43 2013-07-02 00:55:13 +02:00
kaetemi
3b630492aa Fix a render target issue, see #43 2013-07-02 00:53:45 +02:00
kaetemi
ffc91631e7 Create stereo render target, see #43 2013-07-01 23:23:54 +02:00
kaetemi
f25a9da718 Add interface for stereo display render targets, ref #43 2013-07-01 21:23:47 +02:00
kaetemi
b04d278a27 Create interface classes for stereo displays and head mounted displays, see #43 2013-06-28 23:19:32 +02:00
kaetemi
d404c1228c Create a clipping frustum, ref #43 2013-06-26 21:35:36 +02:00
kaetemi
2f4867ab78 Allow multiple user cameras to be calculated separately, useful for sky etc, re #43 2013-06-26 20:57:37 +02:00
kaetemi
8230238b5f Add eye distance in 2D interface shift, re #43 2013-06-26 17:24:23 +02:00
kaetemi
1b8ddaa87b Add 2D interface shifting calculations, see #43 2013-06-26 16:59:08 +02:00
kaetemi
cbd72f73ff Add some comments, see #43 2013-06-26 15:55:39 +02:00
kaetemi
7672ab2812 Cleanup and make bloom work with stereo rendering, re #43 2013-06-26 15:49:31 +02:00
kaetemi
e51d9e15d9 Render from multiple cameras, see #43 2013-06-26 08:00:19 +02:00
kaetemi
a7cf55c58e Read sensor data and set camera in snowballs, ref #43 2013-06-26 04:57:58 +02:00
kaetemi
dc813a060e Add library name to device name, re #43 2013-06-26 02:55:15 +02:00
kaetemi
b45bdb88e6 List stereo devices, see #43 2013-06-26 02:45:49 +02:00
kaetemi
982bf804de Added some notes 2013-06-20 00:25:52 +02:00
kaetemi
1f68025931 Rename some functions to follow the same naming convention of others 2013-06-19 23:49:39 +02:00
kaetemi
1ed0d46026 Cleanup 2013-06-19 23:34:40 +02:00
kaetemi
aa3462b7bc Add support for fp40 with opengl 2013-06-19 22:41:03 +02:00
kaetemi
cfb9827b2c Test texture with postprocessing material, seems to work with opengl 2013-06-19 20:47:23 +02:00
kaetemi
3865e6e56f Add function to check which pixel program profiles are available on a driver 2013-06-19 05:03:47 +02:00
kaetemi
9c5fabf615 Add test for ps.1.1 pixel program in snowballs (it works too now) 2013-06-19 04:03:32 +02:00
kaetemi
72035e936a Removed unneeded parser related code from the opengl pixel program implementation 2013-06-19 02:33:19 +02:00
kaetemi
acf8ec653c Added diff to opengl driver for old nevrax pixel program code, marked todos in comments 2013-06-19 02:01:12 +02:00
kaetemi
cb966505cc Add rest of the diff from the old nevrax code for pixel programs to NL3D 2013-06-19 01:38:23 +02:00
kaetemi
7da48d8866 Removed some CEffect related bit that slipped in 2013-06-19 01:22:26 +02:00
kaetemi
9f6b60a920 Add diff from old nevrax pixel program code to IDriver, CEffect related code not included 2013-06-19 01:20:51 +02:00
kaetemi
b5dfdbdd55 Simplify CPixelProgram 2013-06-19 01:19:45 +02:00
kaetemi
fd42d61af9 Add some files from old nevrax shader code for exposing pixel programs in the drivers 2013-06-19 01:14:30 +02:00
kaetemi
ad6cc747b9 Backed out changeset ea4b76b7213a, bad approach 2013-06-19 01:03:20 +02:00
kaetemi
23e3393d2e Allow rendering with bloom to a user provided render target (untested) (#43) 2013-06-17 00:45:17 +02:00
kaetemi
abdeee4b81 Add info structure for multipass camera rendering effects #43 2013-06-16 20:48:17 +02:00
kaetemi
5fa4beab46 Fixes to compile Ryzom Client with lua 5.2 2013-06-16 03:43:45 +02:00
kaetemi
7bb6775261 Compile NLGUI with lua 5.2 2013-06-16 02:33:04 +02:00
dfighter1985
c030ad755d When adding a new widget, the correct widget is now instantiated. Also added some checks. 2013-05-09 23:57:48 +02:00
dfighter1985
101d2cc612 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 ). 2013-05-09 05:53:14 +02:00
dfighter1985
059147a5b3 Merged default. 2013-05-04 22:28:31 +02:00
Dzmitry Kamiahin
7ddd062666 Fixed self-comparsion in ps. 2013-05-04 01:57:53 +03:00
dfighter1985
e9d646d864 Merged default 2013-05-03 02:07:38 +02:00