botanic
|
fad0671af1
|
Merge
|
2014-01-26 02:58:42 -08:00 |
|
botanic
|
95c63bc0dd
|
Fix for Issue #94
|
2014-01-26 02:57:59 -08:00 |
|
kervala
|
f256e78b2c
|
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
|
0e57ad38c3
|
Fixed: Compilation with freetype
|
2014-01-25 10:45:57 +01:00 |
|
Nimetu
|
c37850920a
|
Remove tooltip debug message from logs
|
2014-01-04 00:20:05 +02:00 |
|
Nimetu
|
2c38c21a40
|
Add deadlock counter to prevent endless loop (issue #73)
|
2014-01-03 19:11:49 +02:00 |
|
kervala
|
5df1ebf8ba
|
Fixed: Compilation under Mac OS X
|
2013-11-13 22:23:24 +01:00 |
|
kervala
|
ca82fcfe0c
|
Fixed: Warning with clang
|
2013-11-13 22:23:02 +01:00 |
|
kervala
|
1d46a6f94e
|
Changed: Don't need to change _PolygonSmooth if value is the same
|
2013-11-13 21:55:14 +01:00 |
|
kervala
|
1a5100bd93
|
Changed: Implement VSync under Mac OS X
|
2013-11-13 21:54:45 +01:00 |
|
kervala
|
43b87ff588
|
Changed: Replace strlwr by toLower
|
2013-11-13 21:53:21 +01:00 |
|
kervala
|
c2045c928d
|
Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
|
2013-11-13 21:52:21 +01:00 |
|
kervala
|
b7feea6c95
|
Fixed: Warning with clang
|
2013-11-13 21:40:41 +01:00 |
|
kervala
|
753c5d6378
|
Changed: Replaced atof by fromString
|
2013-11-13 21:37:28 +01:00 |
|
kervala
|
5f0a674ad2
|
Changed: Updated OpenGL registry
|
2013-11-13 20:31:08 +01:00 |
|
Botanic
|
8ec1ee4d45
|
Merge
|
2013-11-02 16:35:26 -07:00 |
|
sfb
|
2220c593f5
|
Bad merge resolution, fixed a couple source files which merged poorly.
|
2013-10-28 11:24:31 -05:00 |
|
sfb
|
e9b8e2edba
|
merge from default
|
2013-10-23 12:08:09 -05:00 |
|
Matt Raykowski
|
8c046cf4c0
|
Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
|
2013-10-19 16:02:52 -05:00 |
|
kaetemi
|
08a4d9eb11
|
Fix #67 bad NELID in vertex program parser
|
2013-10-06 20:06:53 +02:00 |
|
kervala
|
88b2a1a38d
|
Fixed: Use multiarch library path under Linux
|
2013-09-30 09:11:35 +02:00 |
|
kervala
|
2becb762f8
|
Fixed: Some warnings
|
2013-09-29 16:26:24 +02:00 |
|
kervala
|
713e7b75b3
|
Changed: Detect Windows 8 and Windows Server 2012
|
2013-09-29 13:41:42 +02:00 |
|
kervala
|
9889049239
|
Fixed: Some warnings
|
2013-09-27 16:30:55 +02:00 |
|
kaetemi
|
185709734d
|
Fix warnings
|
2013-09-27 01:32:01 +02:00 |
|
Quitta
|
3d7a7dc191
|
Merge with quitta-gsoc-2013
|
2013-09-23 00:49:16 +02:00 |
|
kervala
|
4b6ca1e628
|
Fixed: Wrong variable used to compute array length
|
2013-09-22 13:23:03 +02:00 |
|
kervala
|
4f1897208c
|
Fixed: OpenGL ES driver compilation
|
2013-09-22 13:20:53 +02:00 |
|
kervala
|
26370c962d
|
Fixed: Warnings with GCC
|
2013-09-22 13:20:19 +02:00 |
|
kervala
|
df8c6e9b08
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
2013-09-22 13:10:57 +02:00 |
|
kaetemi
|
64d8faddd0
|
Fix typo
|
2013-09-14 19:05:54 +02:00 |
|
kaetemi
|
adcb3e032b
|
Fix regression from stereo branch in wind tree
|
2013-09-14 18:58:23 +02:00 |
|
kaetemi
|
60cd1f6116
|
Fix compile error in vertex program
|
2013-09-14 17:53:47 +02:00 |
|
kaetemi
|
4adbfd4e4e
|
Update supportVertexProgram calls
|
2013-09-14 16:43:36 +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
|
7d0a84b2d1
|
Merge with default
|
2013-09-13 23:07:49 +02:00 |
|
kaetemi
|
291c5d6012
|
Cleanup
|
2013-09-13 23:02:35 +02:00 |
|
kaetemi
|
881949a5d7
|
Use named indices with wind tree program
|
2013-09-13 22:20:52 +02:00 |
|
kaetemi
|
7176cbc0af
|
Use named indices for per pixel light vertex program
|
2013-09-13 21:47:42 +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
|
f7e80187ad
|
Adjust order for meshvp
|
2013-09-13 18:25:52 +02:00 |
|
kaetemi
|
ce7357ffa4
|
Do not use old interface here
|
2013-09-13 17:17:11 +02:00 |
|
kaetemi
|
7d854d54d1
|
Modify calls in bloom effect
|
2013-09-13 17:11:42 +02:00 |
|
kaetemi
|
2f384d9789
|
Update veget implementation
|
2013-09-13 17:09:05 +02:00 |
|
kaetemi
|
2ee6843cd9
|
Fixes for d3d
|
2013-09-13 17:08:56 +02:00 |
|
kaetemi
|
b77101cdd4
|
Update d3d implementation and add some debugging code
|
2013-09-11 01:12:37 +02:00 |
|
kaetemi
|
f0177268b4
|
Rename of a d3d specific class
|
2013-09-10 19:53:41 +02:00 |
|
kaetemi
|
a798aecd71
|
Partial update of veget vp
|
2013-09-10 19:52:14 +02:00 |
|
kaetemi
|
776f198df3
|
Update some test code
|
2013-09-10 16:42:51 +02:00 |
|
kaetemi
|
7462d731f1
|
Small adjustment to landscape vp parameter setting
|
2013-09-10 16:24:45 +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
|
dd490a0cc4
|
Set driver parameters
|
2013-09-10 02:01:57 +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
|
14026e6f08
|
Set params from storage
|
2013-09-09 23:39:18 +02:00 |
|
kaetemi
|
1447e2f2d8
|
Replace temporary CMaterial code
|
2013-09-09 21:44:14 +02:00 |
|
kaetemi
|
01577f9f95
|
Implement param storage copy
|
2013-09-09 21:05:12 +02:00 |
|
kaetemi
|
aa85673b3b
|
Flag some TODO's
|
2013-09-09 20:55:23 +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
|
fcb0ee720e
|
Implement new driver interface in Direct3D driver
|
2013-09-09 16:36:29 +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
|
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 |
|
kervala
|
a023ab89d7
|
Changed: Updated Freetype libraries variable
|
2013-09-08 12:54:05 +02:00 |
|
kervala
|
811dca71ee
|
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
|
2013-09-08 12:52:00 +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 |
|
kaetemi
|
ddbb65bd34
|
Fix compile error
|
2013-09-07 16:05:28 +02:00 |
|
kervala
|
8d27acc654
|
Changed: Minor changes
|
2013-09-06 15:00:35 +02:00 |
|
kervala
|
53d5e56a2a
|
Changed: Don't use NLMISC includes in NLMISC PCH
|
2013-09-06 14:50:19 +02:00 |
|
Thibaut Girka
|
a45299bfe5
|
Add support for LibVR
|
2013-08-28 08:08:22 +02:00 |
|
kaetemi
|
beb66b19b7
|
Merge with default
|
2013-09-07 16:25:45 +02:00 |
|
kervala
|
d2a9cb90d0
|
Changed: Formatting
|
2013-08-26 12:34:04 +02:00 |
|
kervala
|
dd116afff3
|
Fixed: Crash when trying to display a missing texture
|
2013-08-26 12:33:26 +02:00 |
|
Botanic
|
6deea176a8
|
Make it so that bad text always throws a nlwarning
|
2013-08-04 01:43:54 -07:00 |
|
kaetemi
|
d0a4f5ed75
|
Fix warning
|
2013-08-03 21:29:47 +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
|
1ed7e4fcff
|
Force link
|
2013-08-01 10:11:11 +02:00 |
|
Quitta
|
63db620ca6
|
Merge with default
|
2013-07-31 16:26:22 +02:00 |
|
Quitta
|
e3625bc4e4
|
Merge with default
|
2013-07-31 16:17:29 +02:00 |
|
Quitta
|
0bf8c4d526
|
fix for getting client working + possibly auto login for ingame part
|
2013-07-30 01:46:56 +02:00 |
|
kaetemi
|
7bbf40ea19
|
Improve performance of UsedTexture debugging info in OpenGL driver
|
2013-07-29 03:41:10 +02:00 |
|
kaetemi
|
7046b6f364
|
NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked
|
2013-07-28 21:39:54 +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 |
|
kaetemi
|
f83fdf5a2f
|
Fix bug #45 crash in zone lighter with large number of CPU cores
|
2013-07-24 20:51:43 +02:00 |
|
kervala
|
dfbf2998b0
|
Fixed: lua_open() doesn't exist with Lua 5.2
|
2013-07-24 18:47:50 +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 |
|
Michael Witrant
|
67ebf920ec
|
Added LibOVR finder and Linux support, ref #43
|
2013-07-06 19:33:07 +02:00 |
|
kaetemi
|
cb9e5762db
|
Don't render to texture when in wireframe mode, re #43
|
2013-07-05 03:42:38 +02:00 |
|
kaetemi
|
c3f6f5b8ff
|
Put stereo render loop inside ryzom client main loop, see #43
|
2013-07-05 02:38:56 +02:00 |
|
kaetemi
|
541f75920b
|
Init/release VR interfaces in ryzom client, ref #43
|
2013-07-05 02:04:34 +02:00 |
|
kaetemi
|
6113b07673
|
Distort 2D gui as well, ref #43
|
2013-07-04 21:12:11 +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
|
d57b7b39fe
|
Use width instead of height of screen for hmd fov, re #43
|
2013-07-03 06:04:37 +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
|
e3784571cd
|
Add arbfp1 and fp40 barrel fragment programs, see #43
|
2013-07-02 19:39:05 +02:00 |
|
kaetemi
|
118340d821
|
Test arbfp1, see #43
|
2013-07-02 18:48:29 +02:00 |
|
kaetemi
|
2315ae9c5a
|
Prefer NPOT texture over RECT texture
|
2013-07-02 18:43:15 +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
|
9960b9dfdb
|
Cleanup
|
2013-07-01 20:15:55 +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
|
4a579d0af2
|
Fix warning
|
2013-06-26 20:10:30 +02:00 |
|
kaetemi
|
eb196fd99a
|
Adjust 2D interface shift, re #43
|
2013-06-26 19:58:27 +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
|
78ae99731d
|
Correctly adjust text to viewport, re #43
|
2013-06-26 16:08:48 +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
|
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
|
0d1e405d3e
|
Activate textures for postprocessing material under direct3d
|
2013-06-19 21:16:13 +02:00 |
|
kaetemi
|
4cc4a84578
|
Fix linux compile
|
2013-06-19 16:18:09 +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
|
0c1bfe0f63
|
Cleanup more unneeded code
|
2013-06-19 02:36:57 +02:00 |
|
kaetemi
|
72035e936a
|
Removed unneeded parser related code from the opengl pixel program implementation
|
2013-06-19 02:33:19 +02:00 |
|