Commit graph

265 commits

Author SHA1 Message Date
StudioEtrange
acd4e32b1c FindMSVC fix 2013-09-21 14:14:29 +02:00
kaetemi
d39c6b8e1b Cleanup vr config interface 2013-09-15 02:14:38 +02:00
kaetemi
80df75cb4d Add ingame configuration interface for virtual reality devices 2013-09-15 01:34:06 +02:00
kaetemi
3ae524e6c1 Merge with default 2013-09-14 19:06:10 +02:00
kaetemi
c36b7dfd0c Fix typo 2013-09-14 19:05:54 +02:00
kaetemi
f833562516 Merge with default 2013-09-14 19:02:50 +02:00
kaetemi
8e9c69a566 Fix regression from stereo branch in wind tree 2013-09-14 18:58:23 +02:00
kaetemi
642d6b1373 Fix compile error in vertex program 2013-09-14 17:53:47 +02:00
kaetemi
e2fcaa3aaa Update supportVertexProgram calls 2013-09-14 16:43:36 +02:00
kaetemi
cbdf86dc01 Remove old interface 2013-09-14 16:45:00 +02:00
kaetemi
fa9a30a30c Cleanup unused code 2013-09-14 16:23:11 +02:00
kaetemi
13dcd3d031 Rename 2013-09-14 00:46:10 +02:00
kaetemi
23dfe4b566 Cleanup 2013-09-14 00:36:06 +02:00
kaetemi
23ad938cdb Merge with default 2013-09-13 23:24:13 +02:00
kaetemi
3bbfdea530 Merge with default 2013-09-13 23:07:49 +02:00
kaetemi
21dbee9fb5 Cleanup 2013-09-13 23:02:35 +02:00
kaetemi
b957c976b9 Use named indices with wind tree program 2013-09-13 22:20:52 +02:00
kaetemi
6ee34651f8 Use named indices for per pixel light vertex program 2013-09-13 21:47:42 +02:00
kaetemi
783adf9fba Use named uniform indices for lighted vertex program 2013-09-13 21:31:47 +02:00
kaetemi
e3b2908d49 Updated wind tree program container 2013-09-13 20:45:06 +02:00
kaetemi
c7894d0c15 Use lighted vertex program container for per pixel light program 2013-09-13 20:00:20 +02:00
kaetemi
2d9212669a Add container for lighted vertex program 2013-09-13 19:03:05 +02:00
kaetemi
364b47c40d Adjust order for meshvp 2013-09-13 18:25:52 +02:00
kaetemi
018af56b0d Do not use old interface here 2013-09-13 17:17:11 +02:00
kaetemi
ba35a8d897 Modify calls in bloom effect 2013-09-13 17:11:42 +02:00
kaetemi
b8bed60a02 Update veget implementation 2013-09-13 17:09:05 +02:00
kaetemi
d0b67e9f4f Fixes for d3d 2013-09-13 17:08:56 +02:00
kaetemi
c11ad45d91 Update d3d implementation and add some debugging code 2013-09-11 01:12:37 +02:00
kaetemi
9a75f11c78 Rename of a d3d specific class 2013-09-10 19:53:41 +02:00
kaetemi
4b69fd26bf Partial update of veget vp 2013-09-10 19:52:14 +02:00
kaetemi
adb6507c6c Update decal vp 2013-09-10 17:01:33 +02:00
kaetemi
2cfb6593ce Update some test code 2013-09-10 16:42:51 +02:00
kaetemi
7f02dc6a5f Small adjustment to landscape vp parameter setting 2013-09-10 16:24:45 +02:00
kaetemi
54ccd5d129 Simplify 2013-09-10 15:59:31 +02:00
kaetemi
f507a1cf3e Adjust landscape vertex program to use new interface 2013-09-10 15:42:42 +02:00
kaetemi
0af16b9fc2 Use new program interface for water vertex program 2013-09-10 02:07:16 +02:00
kaetemi
d0e5790bde Set driver parameters 2013-09-10 02:01:57 +02:00
kaetemi
14df080ede Some fixes 2013-09-10 01:29:53 +02:00
kaetemi
bc409d3426 Use CSmartPtr for vertex program 2013-09-10 00:31:26 +02:00
kaetemi
cbd39ba84c Set params from storage 2013-09-09 23:39:18 +02:00
kaetemi
be55ac218a Fix incorrectly removed line 2013-09-09 23:03:52 +02:00
kaetemi
76e4315c3b Missed file in last commit 2013-09-09 23:01:43 +02:00
kaetemi
729208e74b Replace temporary CMaterial code 2013-09-09 21:44:14 +02:00
kaetemi
5c32f70857 Implement param storage copy 2013-09-09 21:05:12 +02:00
kaetemi
4f10f8eaee Flag some TODO's 2013-09-09 20:55:23 +02:00
kaetemi
a6901fd00a Add glsl pixel program for stereo distortion 2013-09-09 20:49:59 +02:00
kaetemi
e6c0ea328b Cleanup abstract gpu program interface 2013-09-09 18:33:38 +02:00
kaetemi
6dba9a7117 Implement new driver interface in Direct3D driver 2013-09-09 16:36:29 +02:00
kaetemi
fd0b45c1db Implement new driver interface in OpenGL driver 2013-09-09 14:43:10 +02:00
kaetemi
381ffd1bc6 Expand parameter interface 2013-09-09 12:18:20 +02:00
kaetemi
b4cdeed369 Reduce function duplication 2013-09-09 02:03:40 +02:00
kaetemi
7fe71b9682 Builtin parameter set functions 2013-09-09 01:53:02 +02:00
kaetemi
bb80d71b9b Separate count and size 2013-09-09 01:31:15 +02:00
kaetemi
b0079c38be Cleanup driver interface 2013-09-08 21:57:27 +02:00
kaetemi
879fe9da61 Add additional set functions 2013-09-08 01:49:34 +02:00
kaetemi
c47fc285f1 Add gpu program params storage structure 2013-09-08 01:36:01 +02:00
kaetemi
dbcf366a57 Implement new gpu program interface in direct3d driver 2013-09-07 22:00:07 +02:00
kaetemi
08d3b876e5 Merge with default 2013-09-07 21:36:08 +02:00
kaetemi
b300cda50e Implement new gpu program interface in opengl driver 2013-09-07 21:30:40 +02:00
kaetemi
6491a288d1 Make gpu programs use abstract gpu program class 2013-09-07 20:41:07 +02:00
kaetemi
2248d13b3d Add abstract gpu program and source classes 2013-09-07 18:33:18 +02:00
Thibaut Girka
855dda7130 Add support for LibVR 2013-08-28 08:08:22 +02:00
kaetemi
8efbf91d78 Merge with default 2013-09-07 16:25:45 +02:00
kaetemi
8c40293f55 Fix warning 2013-08-03 21:29:47 +02:00
kaetemi
2d118078f7 Merge with default 2013-08-01 23:02:49 +02:00
kaetemi
8fd226d166 Build ligo outside the database 2013-07-27 04:03:05 +02:00
kaetemi
1fdde1e56d Merge with default 2013-07-25 21:18:52 +02:00
kaetemi
b93ab158a5 Merge with default 2013-07-25 00:37:00 +02:00
kaetemi
cbe1872eb8 Merge with default 2013-07-19 18:12:08 +02:00
kaetemi
a7970b17ac Merge with default 2013-07-19 15:38:49 +02:00
kaetemi
efaf25fd95 Merge with default 2013-07-19 14:10:07 +02:00
kaetemi
f039c22f0c Merge with default 2013-07-18 23:05:25 +02:00
kaetemi
7aed5b709d Fix bad includes in snowballs, re #43 2013-07-06 21:58:26 +02:00
Michael Witrant
db58b68330 Fixed definition tests for optional LibOVR 2013-07-06 20:40:42 +02:00
Michael Witrant
1a397ec068 LibOVR is optional, and is disabled by default 2013-07-06 20:05:19 +02:00
Michael Witrant
48cc5ac5fe Added Win32 and Apple LibOVR build paths 2013-07-06 19:55:08 +02:00
Michael Witrant
6c049ae905 Fixed Linux build failure because a temporary pointer was passed, ref #43 2013-07-06 19:34:28 +02:00
Michael Witrant
c3490a2ee4 Added LibOVR finder and Linux support, ref #43 2013-07-06 19:33:07 +02:00
kaetemi
3f1a2fe6bd Handle head orientation in ryzom client, ref #43 2013-07-05 04:09:53 +02:00
kaetemi
a0140fd551 Don't render to texture when in wireframe mode, re #43 2013-07-05 03:42:38 +02:00
kaetemi
fc663f210f Put stereo render loop inside ryzom client main loop, see #43 2013-07-05 02:38:56 +02:00
kaetemi
fbb9ec7379 Init/release VR interfaces in ryzom client, ref #43 2013-07-05 02:04:34 +02:00
kaetemi
358fe91bbf Move some more updates out of the render code, see #43 2013-07-05 00:47:17 +02:00
kaetemi
df2835df4d Some necessary changes to camera setting, re #43 2013-07-05 00:17:09 +02:00
kaetemi
5fdb44ce04 Some more cleanup 2013-07-04 23:41:46 +02:00
kaetemi
eebe0c6b4e Make oversize screenshots be perfectly seamless 2013-07-04 23:11:15 +02:00
kaetemi
f7caadf8d8 Pull weather updates out of scene render 2013-07-04 22:39:05 +02:00
kaetemi
014ce65c70 Correctly apply bloom on oversize screenshots 2013-07-04 22:26:31 +02:00
kaetemi
c6daf905a3 Refactor fulldetail override 2013-07-04 22:18:19 +02:00
kaetemi
2e4a3c95b5 Merge with default 2013-07-04 21:12:34 +02:00
kaetemi
1ebc74f9d2 Distort 2D gui as well, ref #43 2013-07-04 21:12:11 +02:00
kaetemi
6b0c19b3d5 Correctly synchronize some more animation in snowballs, re #43 2013-07-04 20:43:49 +02:00
kaetemi
5fc257141c Fix particles being animated twice in stereo render, see #43 2013-07-04 00:42:06 +02:00
kaetemi
834f478700 Add stereo debugger for visually comparing rendered frames, ref #43 2013-07-04 00:09:10 +02:00
kaetemi
7cd5a94e4c Use width instead of height of screen for hmd fov, re #43 2013-07-03 06:04:37 +02:00
kaetemi
d700d01c6a Add minimal head model and world scale, ref #43 2013-07-03 05:21:32 +02:00
kaetemi
783c15b072 Make bloom work together with render target used for the rift shader, ref #43 2013-07-03 03:53:32 +02:00
kaetemi
afe8b1a8e6 Remove unnecessary user render target code from bloom, see #43 2013-07-03 03:21:57 +02:00
kaetemi
20f9cbd215 Merge with default 2013-07-03 03:17:29 +02:00
kaetemi
8249a7d26b Add arbfp1 and fp40 barrel fragment programs, see #43 2013-07-02 19:39:05 +02:00
kaetemi
72eb001b0a Test arbfp1, see #43 2013-07-02 18:48:29 +02:00
kaetemi
813a7773c2 Properly scale seconds per frame graph in snowballs 2013-07-02 18:43:28 +02:00
kaetemi
3cb613b0d2 Prefer NPOT texture over RECT texture 2013-07-02 18:43:15 +02:00
kaetemi
13724ee1d4 Render left and right deformed view, re #43 2013-07-02 03:34:49 +02:00
kaetemi
5354a2851c Test the barrel shader, see #43 2013-07-02 02:40:27 +02:00
kaetemi
e0435fbc06 Workaround in snowballs for fullscreen bug with opengl driver 2013-07-02 01:08:49 +02:00
kaetemi
9a5853a077 Render the scene to a target texture for the stereo rendering filter, ref #43 2013-07-02 00:55:13 +02:00
kaetemi
8990b521fd Fix a render target issue, see #43 2013-07-02 00:53:45 +02:00
kaetemi
6b33f0c5b8 Create stereo render target, see #43 2013-07-01 23:23:54 +02:00
kaetemi
fcd9344ad5 Add interface for stereo display render targets, ref #43 2013-07-01 21:23:47 +02:00
kaetemi
1756adb303 Allow turning off bloom in snowballs 2013-07-01 20:38:18 +02:00
kaetemi
8818e886af Cleanup 2013-07-01 20:15:55 +02:00
kaetemi
779d2c1892 Allow linking debug and release with same mysql lib if no specific debug lib. 2013-07-01 18:45:43 +02:00
kaetemi
e1397a0dc3 Create interface classes for stereo displays and head mounted displays, see #43 2013-06-28 23:19:32 +02:00
kaetemi
4ef8b7c109 Separate some camera related functions, ref #43 2013-06-27 04:11:09 +02:00
kaetemi
8b761cc830 Move some config stuff out of main_loop.cpp, see #43 2013-06-27 03:49:30 +02:00
kaetemi
03e9acfab3 Remove some unused includes, re #43 2013-06-27 03:16:53 +02:00
kaetemi
a7562a1059 Some more debug functions moved, see #43 2013-06-27 03:04:40 +02:00
kaetemi
c89810bcd8 Moved some temp code out of main_loop.cpp, ref #43 2013-06-27 02:43:51 +02:00
kaetemi
1ee82909c3 Take some debug render code out of main_loop.cpp, see #43 2013-06-27 02:13:48 +02:00
kaetemi
5bd6b5ee7a Separate some profiling code from main_loop.cpp, see #43 2013-06-27 01:43:04 +02:00
kaetemi
0a2a08ce07 Pull CPing out of main_loop.cpp, refs #43 2013-06-27 01:23:53 +02:00
kaetemi
5665253af7 Return view as CQuat, see #43 2013-06-26 21:36:21 +02:00
kaetemi
a68f54b4e8 Create a clipping frustum, ref #43 2013-06-26 21:35:36 +02:00
kaetemi
922b0e67ad Allow multiple user cameras to be calculated separately, useful for sky etc, re #43 2013-06-26 20:57:37 +02:00
kaetemi
641c651533 Fix warning 2013-06-26 20:10:30 +02:00
kaetemi
f4d337b413 Adjust 2D interface shift, re #43 2013-06-26 19:58:27 +02:00
kaetemi
9c84d9b56c Move snowballs compass, see #43 2013-06-26 17:38:20 +02:00
kaetemi
b7685170a2 Add eye distance in 2D interface shift, re #43 2013-06-26 17:24:23 +02:00
kaetemi
e5d2958321 Add 2D interface shifting calculations, see #43 2013-06-26 16:59:08 +02:00
kaetemi
f7f611e6a6 Correctly adjust text to viewport, re #43 2013-06-26 16:08:48 +02:00
kaetemi
7afbbb3188 Add some comments, see #43 2013-06-26 15:55:39 +02:00
kaetemi
4c4640c954 Cleanup and make bloom work with stereo rendering, re #43 2013-06-26 15:49:31 +02:00
kaetemi
826da99473 Render from multiple cameras, see #43 2013-06-26 08:00:19 +02:00
kaetemi
4289248d56 Read sensor data and set camera in snowballs, ref #43 2013-06-26 04:57:58 +02:00
kaetemi
8fad0e92b7 Add library name to device name, re #43 2013-06-26 02:55:15 +02:00
kaetemi
31e96ad6c5 List stereo devices, see #43 2013-06-26 02:45:49 +02:00
kaetemi
1f972da834 Merge with default 2013-06-26 00:00:35 +02:00
kaetemi
26567a3ce8 Added some notes 2013-06-20 00:25:52 +02:00
kaetemi
95eb1499ee Rename some functions to follow the same naming convention of others 2013-06-19 23:49:39 +02:00
kaetemi
b7294b9246 Cleanup 2013-06-19 23:34:40 +02:00
kaetemi
143ab99b89 Add support for fp40 with opengl 2013-06-19 22:41:03 +02:00
kaetemi
3ff6a3c640 Additional test, textures does not seem to work in ps_3_0 2013-06-19 21:31:29 +02:00
kaetemi
66d4a90892 Activate textures for postprocessing material under direct3d 2013-06-19 21:16:13 +02:00
kaetemi
7625336f1b Test texture with postprocessing material, seems to work with opengl 2013-06-19 20:47:23 +02:00
kaetemi
7e78f66c20 Updated snowballs default config 2013-06-19 16:22:48 +02:00
kaetemi
3be1be1111 Fix linux compile 2013-06-19 16:18:09 +02:00
kaetemi
e1176c3198 Add function to check which pixel program profiles are available on a driver 2013-06-19 05:03:47 +02:00
kaetemi
52b9637167 Add test for ps.1.1 pixel program in snowballs (it works too now) 2013-06-19 04:03:32 +02:00
kaetemi
7e35bea71f Add test for ARBfp1.0 fragment program in snowballs (it works) 2013-06-19 02:59:32 +02:00