Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
4286 commits 14 branches 1 tag 255 MiB
Commit graph

1174 commits

Author SHA1 Message Date
botanic
e995784886 Fixed typo issue 60 2014-01-28 11:41:26 -08:00
botanic
71b0f9ae92 Issue #60 
does seem to work better when latency is high
 2014-01-26 03:20:00 -08:00
botanic
60495f79ac Merge 2014-01-26 02:58:42 -08:00
botanic
b6441edf2d Fix for Issue #94 2014-01-26 02:57:59 -08:00
kervala
a5a9532a13 Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h) 2014-01-26 11:03:33 +01:00
kervala
09e3471f1b Fixed: Compilation with freetype 2014-01-25 10:45:57 +01:00
Nimetu
ea5a36b105 Remove tooltip debug message from logs 
--HG--
branch : misc-patches
 2014-01-04 00:20:05 +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
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
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
df7110d2d6 Bad merge resolution, fixed a couple source files which merged poorly. 
--HG--
branch : gsoc2011-worldeditorqt
 2013-10-28 11:24:31 -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
43bbfe3da7 Fixed: Some warnings 2013-09-27 16:30:55 +02:00
kaetemi
3b4730c890 Fix warnings 2013-09-27 01:32:01 +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
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
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
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
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
d03c795dd8 Changed: Don't use NLMISC includes in NLMISC PCH 2013-09-06 14:50:19 +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
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
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
kervala
aeddda3e19 Fixed: lua_open() doesn't exist with Lua 5.2 2013-07-24 18:47:50 +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
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
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