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
|
0a9dfc6aef
|
Update decal vp
--HG--
branch : multipass-stereo
|
2013-09-10 17:01:33 +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
|
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
|
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
|
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 |
|
kervala
|
0b9092a547
|
Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)
|
2013-09-08 12:57:34 +02:00 |
|
kervala
|
0ccec811d6
|
Changed: Updated Freetype libraries variable
|
2013-09-08 12:54:05 +02:00 |
|
kervala
|
11dd2bc101
|
Changed: Look for Debug versions of libwww libraries
|
2013-09-08 12:53:35 +02:00 |
|
kervala
|
87ee7fa8d2
|
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
|
2013-09-08 12:52:00 +02:00 |
|
kervala
|
17ebe78cf6
|
Changed: Look for Debug version of freetype and use it for Debug configuration
|
2013-09-08 10:26:23 +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
|
0a3f3f1760
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-09-07 21:36:08 +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 |
|
StudioEtrange
|
3121a83730
|
Merged ryzom/ryzomcore into default
|
2013-09-07 20:16:17 +02:00 |
|
kaetemi
|
97c9c26690
|
Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
|
2013-09-07 18:33:18 +02:00 |
|
kervala
|
9dccf31863
|
Removed: S3TC module because not used anymore
|
2013-09-07 17:01:06 +02:00 |
|
kaetemi
|
361b7eab74
|
Fix compile error
|
2013-09-07 16:05:28 +02:00 |
|
kaetemi
|
348594e5fd
|
Merge
|
2013-09-07 15:54:36 +02:00 |
|
kaetemi
|
68f20a3369
|
Use distSqTo instead of distTo
|
2013-09-07 15:53:17 +02:00 |
|
kaetemi
|
082ce825a5
|
Add distSqTo to CAIVector
|
2013-09-07 15:53:10 +02:00 |
|
kaetemi
|
9e1ca3d1d0
|
Comment if-check around commented unused client-side speed limiting code
|
2013-09-07 15:53:00 +02:00 |
|
kaetemi
|
e99bf91b20
|
Move r2 plot item security off the AIS to the EGS and remove hardcoded sheet ids
|
2013-09-07 15:51:30 +02:00 |
|
StudioEtrange
|
fec561914d
|
Merged ryzom/ryzomcore into default
|
2013-09-07 01:39:45 +02:00 |
|
kervala
|
89b945bb8c
|
Changed: Minor changes
|
2013-09-06 15:00:35 +02:00 |
|
kervala
|
980b7120c8
|
Changed: Merged code from official client
|
2013-09-06 15:00:01 +02:00 |
|
kervala
|
3c37af1bbc
|
Fixed: Define math.fmod as a function for Lua 5.0
|
2013-09-06 14:53:40 +02:00 |
|
kervala
|
86dfd0350b
|
Fixed: Integer 32 bits conversion to 64 bits pointer
|
2013-09-06 14:51:21 +02:00 |
|
kervala
|
d03c795dd8
|
Changed: Don't use NLMISC includes in NLMISC PCH
|
2013-09-06 14:50:19 +02:00 |
|
kervala
|
ca9597e11e
|
Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style
|
2013-09-06 14:49:12 +02:00 |
|
kervala
|
37fa1fa1ec
|
Fixed: Use 32 bits libraries from Windows SDK in 64 bits
|
2013-09-06 14:48:21 +02:00 |
|
kervala
|
a62b5068f7
|
Changed: Replace atoi by NLMISC::fromString
|
2013-09-06 14:45:48 +02:00 |
|
kervala
|
d196f05b7e
|
Removed: DInput module because it's not used anymore
|
2013-09-06 14:44:03 +02:00 |
|
StudioEtrange
|
d2530f6894
|
Merged ryzom/ryzomcore into default
|
2013-09-06 14:14:51 +02:00 |
|
kervala
|
f2bc8f3c8c
|
Added: Toolchains for Android and iOS
|
2013-09-06 13:38:19 +02:00 |
|
kervala
|
3988120c55
|
Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION
Changed: Look for all installed Windows SDKs
|
2013-09-06 13:35:43 +02:00 |
|
kervala
|
6ddf4786ff
|
Changed: Use /X everytime with MSVC
|
2013-09-06 09:30:54 +02:00 |
|
kervala
|
3a7cee4aa7
|
Changed: Improved MFC module
|
2013-09-06 09:26:23 +02:00 |
|
kervala
|
4a4b9b5ab8
|
Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH
|
2013-09-06 09:02:48 +02:00 |
|
kervala
|
651065e4ed
|
Added: MSVC module to use later
|
2013-09-06 09:01:42 +02:00 |
|
kervala
|
a71f08274e
|
Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS
|
2013-09-06 09:00:33 +02:00 |
|
kervala
|
969d9a057d
|
Changed: Display a message when compiling with NMake and define NMAKE
|
2013-09-06 08:58:36 +02:00 |
|
kervala
|
a52df4c710
|
Changed: Factorized AMD/amd
|
2013-09-06 08:58:02 +02:00 |
|
kervala
|
26679e767e
|
Changed: Allow to put a "revision" file in root directory if .hg directory is not present
|
2013-09-06 08:44:57 +02:00 |
|
kervala
|
3e4a567d6a
|
Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases)
|
2013-09-06 08:43:44 +02:00 |
|
StudioEtrange
|
f10b6613cf
|
** PCH Support for NMake with VS2012
NMAKE-VS2012 Error LNK2011
while NMAKE-VS2010 does not complain
we need to link the pch.obj file
see http://msdn.microsoft.com/en-us/library/3ay26wa2(v=vs.110).aspx
** PCH Support for Ninja
Ninja need to add property
OBJECT_DEPENDS for using PCH
OBJECT_OUTPUTS for create PCH
see http://public.kitware.com/pipermail/cmake-developers/2012-March/003653.html
|
2013-09-05 17:18:01 +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 |
|
kervala
|
f680e3943d
|
Changed: Minor formatting
|
2013-08-05 10:34:38 +02:00 |
|
kervala
|
a41ba055a5
|
Fixed: PCH with Qt 5 and CMake 2.8.11
|
2013-08-05 10:32:17 +02:00 |
|
kervala
|
c792c423db
|
Fixed: X64 not detected with CMake 2.8.11
|
2013-08-05 10:31:23 +02:00 |
|
kervala
|
2c7f848c83
|
Changed: Tabulations to spaces
|
2013-08-05 10:30:40 +02: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 |
|
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
|
f5a8bd2785
|
Missed one
|
2013-07-28 18:22:35 +02:00 |
|
kaetemi
|
692dafacfb
|
Fix a typo
|
2013-07-28 18:19:51 +02:00 |
|