townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,869 Commits 3 Branches 3 Tags 168 MiB
cc-2
Commit Graph

9869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
e17a88b46f GetData() on D3D11 for Texture3D & TextureCube. 2015-03-13 09:09:41 +02:00
Lasse Öörni
d1b03d95db Texture2D::GetData() for D3D11. D3D11 texture code cleanup. 2015-03-13 01:11:01 +02:00
Lasse Öörni
785df863e4 Save spot textures generated by RampGenerator as RGB. 2015-03-12 21:39:28 +02:00
Lasse Öörni
3759570319 Remove rrr swizzle from lighting shaders to allow the spotlight to be colored. Convert the default spot textures to RGB color to avoid sampling only the R channel on D3D11. 2015-03-12 21:25:42 +02:00
Yao Wei Tjong 姚伟忠
3503a1069e Fix test case setup. Only add test case when URHO3D_TESTING is enabled. 2015-03-12 18:58:31 +08:00
Yao Wei Tjong 姚伟忠
8a77399bd0 Fix integration tests execution for Emscripten platform. 
A test case is considered passed when the html exits as the result of emscripten_force_exit() function being called, which happens when the engine's elapsed time reaches URHO3D_TEST_TIMEOUT seconds. When something goes wrong, the engine's elapsed time does not progress as per normal, in this case the emrun's timeout would kick in and terminate the test case with failed exit status. The EMRUN'S timeout is set to be 2 times URHO3D_TEST_TIMEOUT auotmatically.
Add new build option EMSCRIPTEN_EMRUN_BROWSER to select which browser to use for testing. Default is 'firefox'. Refer to https://github.com/kripken/emscripten/issues/3234 to apply the recommended Firefox preference setting for emrun.
 2015-03-12 18:04:16 +08:00
Lasse Öörni
e3f2220fe0 Remove forgotten todo. Implement Graphics::GetMultisampleLevels() properly on D3D11. 2015-03-12 10:15:54 +02:00
Yao Wei Tjong 姚伟忠
10e18da92e Slightly improve code size and startup speed for Emscripten platform. 2015-03-12 11:30:47 +08:00
Lasse Öörni
9dae13c4ab Disable system bell sounds from Alt key combinations. 2015-03-12 01:03:14 +02:00
Lasse Öörni
b55321fc40 When AnimatedSprite2D creates new sprite components, use the AnimatedSprite2D's enabled status. Closes #678. 2015-03-11 14:12:00 +02:00
Yao Wei Tjong 姚伟忠
17f6bc5ff8 Make it more bullet-proof to copy paste error by new user. 
The project name 'Urho3D' is reserved just for Urho3D project.
 2015-03-11 15:37:06 +08:00
Yao Wei Tjong 姚伟忠
2c798dd5bf Add support for ToCppHook.lua to accept extra parameter. 
The extra param 'IS_BUILDING_URHO3D' should not be passed by external project.
 2015-03-11 14:57:59 +08:00
Lasse Öörni
43a7e8a430 sRGB texture sampling on D3D11. 2015-03-11 01:17:59 +02:00
Lasse Öörni
242a675b01 sRGB backbuffer support on D3D11. 2015-03-11 00:56:14 +02:00
Lasse Öörni
c8e406489d Revert OpenGL-incompatible change in Batch::Prepare(). 2015-03-10 23:22:39 +02:00
Lasse Öörni
db62248def Only collect the shadow caster projection space merged bounding box when necessary (focused spot lights.) 2015-03-10 23:12:27 +02:00
Lasse Öörni
401585972d Optimize Graphics::SetVertexBuffers() on D3D11. 2015-03-10 22:07:06 +02:00
Lasse Öörni
c833b34b7a Remove Graphics::SetDrawAntialiased() as it does not help the situation it was created for (blurred UI rendering on Nvidia 16x multisampling on OpenGL) and it cannot be implemented on D3D11. 2015-03-10 21:30:09 +02:00
Lasse Öörni
16ec1f5812 Strip D3D11 shader bytecode. 2015-03-10 12:35:49 +02:00
Lasse Öörni
a5a8442397 Keep track of the dirtied vertex buffer range to not set D3D11 buffer slots unnecessarily. 2015-03-10 01:45:42 +02:00
Lasse Öörni
dffab8cff1 Add item to Edit menu ("Add children to SM-group") to add all children of the StaticModelGroup node as instances. Closes #676. 2015-03-09 21:14:04 +02:00
Lasse Öörni
12c4f2a2b9 Nullcheck materials before using them in Drawable2D sorting. 2015-03-09 20:23:08 +02:00
Lasse Öörni
2239f5750f D3D11 screenshot save. Fix not releasing the backbuffer texture after GetResource(). 2015-03-08 22:45:59 +02:00
Lasse Öörni
4e308f21c3 3D textures on D3D11. Fixed the ColorCorrection shader. 2015-03-08 20:16:15 +02:00
Lasse Öörni
72a153f1a3 Fix Tonemap shader for D3D11. 2015-03-08 16:23:23 +02:00
Lasse Öörni
871fc3abea Fix erroneous UI rendering after compiling the Text shader, by listing texcoord interpolator before color. 2015-03-08 16:15:17 +02:00
Lasse Öörni
e106f1b389 D3D11 clip plane support. Check that multisample level is supported. Various shader fixes. 2015-03-08 02:57:08 +02:00
Lasse Öörni
b9278e0a94 Implement partial rendertarget clear on D3D11. Implement Graphics::ResolveToTexture() on D3D11. Fix most post-process shaders on D3D11. Readded the custom constant buffer slot. Update documentation. 2015-03-07 23:02:31 +02:00
Lasse Öörni
988f1fdc33 Merge branch 'master' into render-refactor 2015-03-07 17:59:37 +02:00
Lasse Öörni
e6194640ff Do not skip the assimp scene root, if it has non-identity transform or contains models itself. 2015-03-07 16:34:29 +02:00
Lasse Öörni
1c549bceee Import also empty child nodes in AssetImporter scene mode, unless disabled with the -ne option. Refactor handling of the root scene node to prevent unnecessary creation of a duplicate root node. Do not attempt to parse .json files as XML in the editor resource browser. Closes #673. 2015-03-07 13:36:27 +02:00
Yao Wei Tjong 姚伟忠
429f8d50fd Fix to addd EMSCRIPTEN_SYSROOT into internal SYSROOT variable. 
[ci skip]
 2015-03-07 13:32:32 +08:00
Yao Wei Tjong 姚伟忠
693aeb97a8 Add '--emrun' to general linker flag var instead of just for debug. 2015-03-07 12:14:53 +08:00
Yao Wei Tjong 姚伟忠
0fe597223f Add initial support for integration tests on Emscripten platform. 
At the moment the 'make test' cannot be run non-interactively yet on Linux host and Mac OS X host systems due to what-could-be a bug in 'emrun' script. The issue with 'emrun' has been reported to upstream (https://github.com/kripken/emscripten/issues/3234).
 2015-03-07 12:00:47 +08:00
Lasse Öörni
f660213930 Fix AngelScript API compile on VS2015. Add CMake bat file for VS2015. 2015-03-07 01:09:13 +02:00
Lasse Öörni
6112220b16 Cube maps, point light shadows & deferred / light prepass rendering on D3D11. 2015-03-05 23:32:16 +02:00
Lasse Öörni
1d165f3e55 Fix crash when calling FixInterpolation() on compressed sound data. Add better explanation as this function is normally not needed to be called. 2015-03-05 20:45:20 +02:00
Yao Wei Tjong 姚伟忠
6a145befa5 Misc. clean up. [ci skip] 2015-03-05 21:57:31 +08:00
Yao Wei Tjong 姚伟忠
6ef0f702c7 For Travis CI - sync the samples first then update json data file. 
[ci skip]
 2015-03-05 17:31:10 +08:00
Yao Wei Tjong 姚伟忠
6c3d32d64a Use Urho3D custom HTML shell for Emscripten build. 
Simplify the custom command for share data generation since we are not going to "fix" the UUID issue of the file_packager.py anymore. Although this would mean the slightest change in the output JS file caused by UUID change could force a long relink process in our build.
For Travis CI - upload Emscripten HTML5 samples to Urho3D main website.
[ci package]
 2015-03-05 16:23:59 +08:00
Lasse Öörni
8b49a21587 Fix shadow alpha mask shader. 2015-03-05 00:42:19 +02:00
Lasse Öörni
4542e38b73 Fix terrain shader on D3D11. 2015-03-05 00:32:25 +02:00
Lasse Öörni
17cf79ab82 D3D11 rendertarget and initial shadow (directional & spot light) support. Fix creating too many rasterizer states for depth bias by quantizing. Fix crash on exit if states failed to create. 2015-03-05 00:21:21 +02:00
Lasse Öörni
6f68c07486 Moved std::begin() and std::end() for Urho containers into their respective header files, so that including ForEach.h is not needed for using the native range-based for. 2015-03-04 16:38:04 +02:00
Lasse Öörni
6fd6efc4c3 Update PugiXml to 1.5. Do not attempt to parse .txt & .icns files as xml in the editor resource browser, to prevent log spam. 2015-03-04 16:10:21 +02:00
aster2013
d34dd34fc9 Use array for glyph index to char code mapping. 2015-03-04 10:06:47 +08:00
Yao Wei Tjong 姚伟忠
e7f6e04eec Preserve the JS output file timestamp to avoid unnecessary re-link. 
At the moment a re-link may still take place due to a limitation of Emscripten's file_packager.py tool.
 2015-03-04 00:28:59 +08:00
Yao Wei Tjong 姚伟忠
4d34d0a626 Add new Emscripten build option for creating shared data file. 2015-03-03 23:32:27 +08:00
aster2013
897b1e6acc Fix #675. 2015-03-03 18:57:21 +08:00
Yao Wei Tjong 姚伟忠
2a6401eb54 Code cleanup on setup_emscripten_linker_flags CMake macro. 2015-03-03 13:14:49 +08:00