aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-23 23:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2915 commits 14 branches 0 tags 258 MiB
Commit graph

2837 commits

Author SHA1 Message Date
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
19a8b48355 Avoid redundant per-frame calls to getDbProp("SERVER:USER:DEFAULT_WEIGHT_HANDS") 
--HG--
branch : kaetemi-optimize
 2013-07-28 05:10:06 +02:00
kaetemi
a75bd5d23a Avoid redundant per-frame calls to getDbProp in CNetManager 
--HG--
branch : kaetemi-optimize
 2013-07-28 05:10:06 +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
fb00acf329 Avoid redundant per-frame calls to getDbValue32(toString("SERVER:CHARACTER_INFO:CHARACTERISTICS%d:VALUE", i)) 
--HG--
branch : kaetemi-optimize
 2013-07-28 00:29:32 +02:00
kaetemi
5f80a90a1c Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:FPS", false) 
--HG--
branch : kaetemi-optimize
 2013-07-28 00:29:32 +02:00
kaetemi
2a57f6c647 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false) 
--HG--
branch : kaetemi-optimize
 2013-07-28 00:29:32 +02:00
kaetemi
0897092fe3 Avoid redundant per-frame calls to getDbProp("UI:SAVE:SHOW_RETICLE") 
--HG--
branch : kaetemi-optimize
 2013-07-28 00:29:25 +02:00
kervala
8577277bfd Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method) 2013-07-26 09:33:32 +02:00
Cédric OCHS
1a83892ec6 Merged in StudioEtrange/ryzomcore/StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398 (pull request #19) 
Fix some problems with space char in path on windows
 2013-07-26 08:07:42 +02:00
kaetemi
f6ee2707ea Merge with default 
--HG--
branch : multipass-stereo
 2013-07-25 21:18:52 +02:00
kaetemi
55a00fd518 Don't do EOL changes for database.xml and msg.xml, causes checksum difference 2013-07-25 18:06:32 +02:00
kaetemi
78595ec0e6 Silently sneaking in a nicer splash image for ovqt 2013-07-25 02:39:07 +02:00
kaetemi
1e9771d054 Merge with default 
--HG--
branch : multipass-stereo
 2013-07-25 00:37:00 +02:00
StudioEtrange
0efa7c8aee PCHSupport.cmake edited online with Bitbucket 
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
 2013-07-24 21:57:52 +00:00
StudioEtrange
744267c63b Fix some probleme with spaces in path on windows 
PCHSupport.cmake edited online with Bitbucket

--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
 2013-07-24 20:53:33 +00:00
StudioEtrange
f18dd1f351 Error passing wrong version number to msvc linker 
ENV: WinSDK8 VS2012 Compilation in 64 Bits
ERROR: error when linking client

CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/error-passing-wrong-version-number-to-ms-1374694351376
 2013-07-24 19:32:41 +00:00
StudioEtrange
885a39ad7e nel.cmake edited online with Bitbucket 
--HG--
branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640
 2013-07-24 19:31:10 +00:00
StudioEtrange
cc30e3b8f8 ENV: 
WinSDK8
VS2012
Compilation in 64 Bits

ERROR:
error when linking client

CAUSE:
msvc link support only major and minor version number.
Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537
see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/env-winsdk8-vs2012-compilation-in-64-bit-1374693753244
 2013-07-24 19:22:38 +00:00
kaetemi
e435a07bb6 Fix bug #45 crash in zone lighter with large number of CPU cores 2013-07-24 20:51:43 +02:00
kaetemi
e9c274c135 Use tags for pacs prim export 2013-07-24 20:51:38 +02:00
kaetemi
179669116c EOL 2013-07-24 20:51:26 +02:00
kervala
aeddda3e19 Fixed: lua_open() doesn't exist with Lua 5.2 2013-07-24 18:47:50 +02:00
kervala
296b4384a8 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 2013-07-24 18:47:04 +02:00
kaetemi
5831150471 Merge with default 
--HG--
branch : multipass-stereo
 2013-07-19 18:12:08 +02:00
kaetemi
347d4e0940 Some necessary ryzom tools did not build when client and server were unchecked 2013-07-19 18:11:31 +02:00
kaetemi
662b75f87a Merge with default 
--HG--
branch : multipass-stereo
 2013-07-19 15:38:49 +02:00
kaetemi
02dc3c1cfe Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 2013-07-19 15:37:25 +02:00
kaetemi
f280f4673f Merge with default 
--HG--
branch : multipass-stereo
 2013-07-19 14:10:07 +02:00
kaetemi
53e11d0d68 Merge with default 
--HG--
branch : multipass-stereo
 2013-07-18 23:05:25 +02:00
kaetemi
8323f95e22 Fix issue #48, landscape quality issues caused by incorrect defaults 2013-07-18 18:22:28 +02:00
kaetemi
9f185ce38d Fix an error in 3ds Max with the material script 2013-07-18 18:15:53 +02:00
kaetemi
d5329b1ac8 Fix bad includes in snowballs, re #43 
--HG--
branch : multipass-stereo
 2013-07-06 21:58:26 +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
0036b5c619 Added Win32 and Apple LibOVR build paths 
--HG--
branch : multipass-stereo
 2013-07-06 19:55:08 +02:00
Michael Witrant
fa4cbb00f7 Fixed Linux build failure because a temporary pointer was passed, ref #43 
--HG--
branch : multipass-stereo
 2013-07-06 19:34:28 +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
d1051ce5c9 Handle head orientation in ryzom client, ref #43 
--HG--
branch : multipass-stereo
 2013-07-05 04:09:53 +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
ffe05eae62 Move some more updates out of the render code, see #43 
--HG--
branch : multipass-stereo
 2013-07-05 00:47:17 +02:00
kaetemi
263e506551 Some necessary changes to camera setting, re #43 
--HG--
branch : multipass-stereo
 2013-07-05 00:17:09 +02:00
kaetemi
5ac4a23bd3 Some more cleanup 
--HG--
branch : multipass-stereo
 2013-07-04 23:41:46 +02:00
kaetemi
93d856b394 Make oversize screenshots be perfectly seamless 
--HG--
branch : multipass-stereo
 2013-07-04 23:11:15 +02:00
kaetemi
bf8ad82e21 Pull weather updates out of scene render 
--HG--
branch : multipass-stereo
 2013-07-04 22:39:05 +02:00
kaetemi
5c568c6ea0 Correctly apply bloom on oversize screenshots 
--HG--
branch : multipass-stereo
 2013-07-04 22:26:31 +02:00
kaetemi
c87403ecb9 Refactor fulldetail override 
--HG--
branch : multipass-stereo
 2013-07-04 22:18:19 +02:00
kaetemi
25f5bccfe6 Merge with default 
--HG--
branch : multipass-stereo
 2013-07-04 21:12:34 +02:00
kaetemi
352ee42571 Distort 2D gui as well, ref #43 
--HG--
branch : multipass-stereo
 2013-07-04 21:12:11 +02:00
Jan Boon
46c4cc7aa4 Merged in botanic/rc-botanic-webdev (pull request #13) 
warning and path fix's
 2013-07-04 21:07:21 +02:00
kaetemi
6cfc75a1a2 Correctly synchronize some more animation in snowballs, re #43 
--HG--
branch : multipass-stereo
 2013-07-04 20:43:49 +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
8c86b05d5b Merge with default 
--HG--
branch : multipass-stereo
 2013-07-03 03:17:29 +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
5bae110c2c Properly scale seconds per frame graph in snowballs 
--HG--
branch : multipass-stereo
 2013-07-02 18:43:28 +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
d45813adfc Workaround in snowballs for fullscreen bug with opengl driver 
--HG--
branch : multipass-stereo
 2013-07-02 01:08:49 +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
85977755de Allow turning off bloom in snowballs 
--HG--
branch : multipass-stereo
 2013-07-01 20:38:18 +02:00
kaetemi
fe91e2a751 Cleanup 
--HG--
branch : multipass-stereo
 2013-07-01 20:15:55 +02:00
kaetemi
fba17e4553 Allow linking debug and release with same mysql lib if no specific debug lib. 
--HG--
branch : multipass-stereo
 2013-07-01 18:45:43 +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
bf16ccd320 Separate some camera related functions, ref #43 
--HG--
branch : multipass-stereo
 2013-06-27 04:11:09 +02:00
kaetemi
86eb05a6d0 Move some config stuff out of main_loop.cpp, see #43 
--HG--
branch : multipass-stereo
 2013-06-27 03:49:30 +02:00
kaetemi
24af75fc23 Remove some unused includes, re #43 
--HG--
branch : multipass-stereo
 2013-06-27 03:16:53 +02:00
kaetemi
3912bee50e Some more debug functions moved, see #43 
--HG--
branch : multipass-stereo
 2013-06-27 03:04:40 +02:00
kaetemi
7fa2a05195 Moved some temp code out of main_loop.cpp, ref #43 
--HG--
branch : multipass-stereo
 2013-06-27 02:43:51 +02:00
kaetemi
bcc048145c Take some debug render code out of main_loop.cpp, see #43 
--HG--
branch : multipass-stereo
 2013-06-27 02:13:48 +02:00
kaetemi
4d96c23c95 Separate some profiling code from main_loop.cpp, see #43 
--HG--
branch : multipass-stereo
 2013-06-27 01:43:04 +02:00
kaetemi
cb60e64355 Pull CPing out of main_loop.cpp, refs #43 
--HG--
branch : multipass-stereo
 2013-06-27 01:23:53 +02:00
kaetemi
6d28f88601 Return view as CQuat, see #43 
--HG--
branch : multipass-stereo
 2013-06-26 21:36:21 +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
9255bd73de Move snowballs compass, see #43 
--HG--
branch : multipass-stereo
 2013-06-26 17:38:20 +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
d1bf069708 Add some comments, see #43 
--HG--
branch : multipass-stereo
 2013-06-26 15:55:39 +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
c188dd3e17 Merge with default 
--HG--
branch : multipass-stereo
 2013-06-26 00:00:35 +02:00
kaetemi
f331757718 Fix Ryzom Client scripts for lua 5.2 2013-06-25 23:57:23 +02:00
kaetemi
8ded099fbb Added some notes 
--HG--
branch : multipass-stereo
 2013-06-20 00:25:52 +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
bc25be05ba Additional test, textures does not seem to work in ps_3_0 
--HG--
branch : multipass-stereo
 2013-06-19 21:31:29 +02:00
kaetemi
f278ac7638 Activate textures for postprocessing material under direct3d 
--HG--
branch : multipass-stereo
 2013-06-19 21:16:13 +02:00
kaetemi
3e91b1a5cf Test texture with postprocessing material, seems to work with opengl 
--HG--
branch : multipass-stereo
 2013-06-19 20:47:23 +02:00
kaetemi
ea97602c5f Updated snowballs default config 
--HG--
branch : multipass-stereo
 2013-06-19 16:22:48 +02:00
kaetemi
9b0b1008ff Fix linux compile 
--HG--
branch : multipass-stereo
 2013-06-19 16:18:09 +02:00
kaetemi
dfb110b387 Add function to check which pixel program profiles are available on a driver 
--HG--
branch : multipass-stereo
 2013-06-19 05:03:47 +02:00
kaetemi
9f1ddc9202 Add test for ps.1.1 pixel program in snowballs (it works too now) 
--HG--
branch : multipass-stereo
 2013-06-19 04:03:32 +02:00
kaetemi
c3af389ea6 Add test for ARBfp1.0 fragment program in snowballs (it works) 
--HG--
branch : multipass-stereo
 2013-06-19 02:59:32 +02:00
kaetemi
1c3fc17d91 Cleanup more unneeded code 
--HG--
branch : multipass-stereo
 2013-06-19 02:36:57 +02:00
kaetemi
4200483383 Removed unneeded parser related code from the opengl pixel program implementation 
--HG--
branch : multipass-stereo
 2013-06-19 02:33:19 +02:00
kaetemi
197c0687d9 Add direct3d diff for old nevrax pixel program code, marked a todo in the comments 
--HG--
branch : multipass-stereo
 2013-06-19 02:10:38 +02:00
kaetemi
f08de2dcdc Added diff to opengl driver for old nevrax pixel program code, marked todos in comments 
--HG--
branch : multipass-stereo
 2013-06-19 02:01:12 +02:00
kaetemi
983fab378c Add rest of the diff from the old nevrax code for pixel programs to NL3D 
--HG--
branch : multipass-stereo
 2013-06-19 01:38:23 +02:00
kaetemi
ef720f764f Removed some CEffect related bit that slipped in 
--HG--
branch : multipass-stereo
 2013-06-19 01:22:26 +02:00
kaetemi
3927378399 Add diff from old nevrax pixel program code to IDriver, CEffect related code not included 
--HG--
branch : multipass-stereo
 2013-06-19 01:20:51 +02:00
kaetemi
7be5858010 Simplify CPixelProgram 
--HG--
branch : multipass-stereo
 2013-06-19 01:19:45 +02:00
kaetemi
16d47d742f Add some files from old nevrax shader code for exposing pixel programs in the drivers 
--HG--
branch : multipass-stereo
 2013-06-19 01:14:30 +02:00
kaetemi
f63a275f2b Backed out changeset ea4b76b7213a, bad approach 
--HG--
branch : multipass-stereo
 2013-06-19 01:03:20 +02:00
kaetemi
c7994bb11f Allow rendering with bloom to a user provided render target (untested) (#43) 
--HG--
branch : multipass-stereo
 2013-06-17 00:45:17 +02:00
kaetemi
4a7f58938d Allow stepping through the time delta in multiple passes in snowballs 
--HG--
branch : multipass-stereo
 2013-06-16 23:51:33 +02:00
kaetemi
c7a9edd495 Remove silly heap allocation of a null pointer 
--HG--
branch : multipass-stereo
 2013-06-16 23:49:45 +02:00
kaetemi
f17145cde6 Allow configuration of bloom settings from config files in snowballs 
--HG--
branch : multipass-stereo
 2013-06-16 23:48:40 +02:00
kaetemi
87c30bceea Add info structure for multipass camera rendering effects #43 
--HG--
branch : multipass-stereo
 2013-06-16 20:48:17 +02:00
kaetemi
3b9f934b82 Fixes to compile Ryzom Client with lua 5.2 2013-06-16 03:43:45 +02:00
kaetemi
8629f069ae Allow compiling with shared libxml2 on Windows 2013-06-16 03:19:02 +02:00
kaetemi
d139185b1e Compile NLGUI with lua 5.2 2013-06-16 02:33:04 +02:00
kervala
30d56b7c24 Added: CMake project for shape2obj 2013-06-10 15:48:10 +02:00
kervala
d77926c96e Fixed: EOL for client_config_qt 2013-06-08 14:56:58 +02:00
Botanic
c5f75ec268 fixed thanks kervala 2013-06-06 01:28:12 -07:00
Botanic
1055925bac No reason to hardcode the path 2013-06-05 19:14:49 -07:00
Botanic
503f5d348e Fixed warnings and logout 2013-06-05 19:14:53 -07:00
Botanic
914c5ad303 no reason to make people change the logs path every time 2013-06-05 19:19:09 -07:00
Botanic
7e64c718c4 fixed warning 2013-06-05 19:27:06 -07:00
Botanic
0fc3b07a12 fixed warning 2013-06-05 19:43:10 -07:00
Botanic
a535002554 why the hell make the faster values for "debug only" waiting it so 1990's 2013-06-05 19:59:53 -07:00
Botanic
b1edfcc646 bad eol 2013-06-06 02:56:48 -07:00
dfighter1985
cfc78bd614 FIXED: GUI not showing up because of the interface user functions not getting registered, because of a file linking issue. 2013-06-05 03:29:34 +02:00
dfighter1985
301077c93d Merged default 
--HG--
branch : client_config_qt
 2013-05-04 21:56:21 +02:00
dfighter1985
d2a7c66e9f Use to .toUTF8() instead of .toStdString(). 
--HG--
branch : client_config_qt
 2013-05-04 21:55:41 +02:00
dfighter1985
e950834079 Merged default 
--HG--
branch : client_config_qt
 2013-05-04 21:23:55 +02:00
Dzmitry Kamiahin
68fe576f01 Fixed self-comparsion in ps. 2013-05-04 01:57:53 +03:00
sfb
1bfba35cd0 merge 2013-05-02 14:38:49 -05:00
kaetemi
76a7df820b This should fix #41. It was creating the unknown for the new type and then returning a new sheet for the requested unknown 2013-05-02 21:37:15 +02:00
sfb
2bf56882f8 merge 2013-05-02 14:34:40 -05:00
sfb
8fe6eee93c fixed #40 with an explicit static_cast. 2013-05-02 14:31:10 -05:00