townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,192 Commits 3 Branches 3 Tags 168 MiB
wtest
Commit Graph

338 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
6abb199bc6 Use file symlink instead of directory for STB library. 
Fix #1330.
 2016-04-27 20:07:26 +08:00
Yao Wei Tjong 姚伟忠
31d362f879 Add new engine parameter for enabling/disabling high DPI window mode. 
Temporary fix for issue #1252. The high DPI mode is disabled by default.
 2016-04-24 17:36:32 +08:00
Lasse Öörni
c48b25abca Use the new model format in OgreImporter. 2016-04-16 21:11:42 +03:00
Lasse Öörni
19f3b0f120 Merge branch 'master' into vertexdeclaration 2016-04-16 14:58:30 +03:00
Yao Wei Tjong 姚伟忠
43bea49674 Fix the PBRDemo shell script. 2016-04-15 18:56:31 +08:00
Lasse Öörni
2771411577 Fix OBJ export in Drawable class. Fix wrong indexing in writing vertex colors in AssetImporter. Minor addition to documentation. 2016-04-13 15:48:43 +03:00
Lasse Öörni
ede04a46f1 Added equality operator to VertexElement. Add multiple color & UV channel (up to 4) support to AssetImporter. Make editor's resource browser recognize the UMD2 model format. Closes #707. 2016-04-13 13:43:33 +03:00
1vanK
49a25f787c OgreImporter: fix relative to absolute transform and Jack's walk animation 2016-04-07 18:45:24 +03:00
Yao Wei Tjong 姚伟忠
4d67a73bfc Adjust CMakeLists.txt as now STB is a header-only implementation. 
Additionally, remove all the local changes as they are either not required as the bug has already been fixed upstream or there are other ways to do what we want to do without altering the original code.
 2016-04-03 16:45:40 +08:00
Lasse Öörni
b7a7bdb705 Tabs to spaces, minor comment cleanup. Document new AssetImporter command line option. 2016-03-22 12:46:40 +02:00
Terence
d73be95692 AssetImpoter can import a subset animation frames. 2016-03-22 03:51:45 +08:00
Yao Wei Tjong 姚伟忠
06bcfbeb7b Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Web platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
f5fcfc48f1 Set CMake minimum version to 3.2.3 for Windows platform. 
This is in preparation to use optional components feature of find_package() command for FindDirectX.cmake module (was FindDirect3D).
 2016-03-16 01:45:08 +08:00
Lasse Öörni
49ce2984fe Generate skinning information if animated model has non-skinned subgeometries. Closes #1227. 2016-03-09 14:14:39 +02:00
Lasse Öörni
2e96545687 Output warning in AssetImporter when model has bones and consists of many submeshes, some of which don't have skinning information. 2016-03-09 00:38:47 +02:00
Lasse Öörni
970ebe85db Merge remote-tracking branch 'dragonCASTjosh/STB_Update' 2016-03-08 01:31:31 +02:00
Lasse Öörni
2cbff0669d Search for a common root up to the scene root node if necessary, if there seem to be multiple skeleton roots. Allow saving animations also when no geometry. To improve animation save in that case, prepend the output filename to animation filename in any case. Closes #1221. 2016-03-05 21:31:01 +02:00
Yao Wei Tjong 姚伟忠
64dcd0e41a Do not build Urho3DPlayer when none of the script subsystem is enabled. 
Fix #1224.
 2016-03-05 21:03:29 +08:00
dragonCASTjosh
5698f9205a Change towards getting STB working on shared 2016-03-04 21:01:59 +00:00
dragonCASTjosh
206176eb7a Changes to fix compile errors related to stb_vorbis 2016-02-29 12:59:00 +00:00
urho3d-travis-ci
c4f6f315ff Travis CI: bump copyright to 2016. 
[ccache clear]
 2016-01-26 13:55:03 +00:00
Yao Wei Tjong 姚伟忠
44e7322e4e Enable LuaJIT universal binary build on OSX platform. 
Enable universal binary executables by default when targeting 64-bit OSX platform.
 2016-01-21 10:56:58 +08:00
Lasse Öörni
4a6d39beee Implement missing applying of basepath to package file entries. Closes #1147. 2016-01-11 16:23:21 +02:00
Yao Wei Tjong 姚伟忠
21b01fcd5b Refactor how the EXE and SHARED linker flags are being setup. 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
431559c2bd For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning. 2016-01-06 16:38:58 +08:00
Yao Wei Tjong 姚伟忠
68e2813298 Attempt to use try_run logic to auto-discover build options. 
For AppVeyor - let URHO3D_D3D11 be auto-discovered when scaffolding.
Close #1066.
 2015-12-25 10:37:56 +08:00
Lasse Öörni
b218aececc Sync AssetImporter documentation with the program's actual command line options. Simplify D3D9 uninitialization code with SAFE_RELEASE. Minor code convention edit. 2015-12-24 13:16:17 +02:00
yushli
86825b2ee8 add save as JSON option 2015-12-24 11:36:25 +08:00
Yao Wei Tjong 姚伟忠
f471dd66dd Refactor installation structure for Windows platform. 
Attempt to reenable the try_compile logic to verify if the found Urho3D
library is ABI-compatible with the chosen compiler toolchain.
 2015-12-16 22:21:24 +08:00
Yao Wei Tjong 姚伟忠
1cd242273e Verify found Urho3D library has matching ABI with the chosen compiler. 
Check the CMake minimum version before setting project name as recommended by CMake.
Minor documentation update on how to setup downstream projects using Urho3D library as external library.
For AppVeyor - attempt to add scaffolding test using Urho3D SDK.
 2015-12-14 22:43:00 +08:00
Yao Wei Tjong 姚伟忠
55286eb820 Fix host-tool building. 
[skip appveyor]
 2015-12-13 17:43:54 +08:00
Yao Wei Tjong 姚伟忠
32fb97b5c9 Avoid SDL dependency when building mini Urho for PackageTool target. 
[skip appveyor] [ci only: Emscripten]
 2015-11-26 19:56:13 +08:00
Yao Wei Tjong 姚伟忠
0a88fdbc21 Remove workaround fix for resource prefix path in Urho3DPlayer too. 
[ccache clear]
 2015-11-08 20:34:04 +08:00
Yao Wei Tjong 姚伟忠
587344af8a Minor cleanup to simplify the override condition for sample code. 2015-11-04 22:26:36 +08:00
Yao Wei Tjong 姚伟忠
f47c04dcee Minor fix on code comment. [ci skip] 2015-11-04 00:16:27 +08:00
Yao Wei Tjong 姚伟忠
8c8e2a97b5 Allow -pp and URHO3D_PREFIX_PATH to override the sample default paths. 
This is useful for user to try out the apps with alternate asset directories.
 2015-11-04 00:06:34 +08:00
Yao Wei Tjong 姚伟忠
22bd3de807 Refactor resource prefix path parameter to accept a list of paths. 
Close #1000.
 2015-11-03 17:46:56 +08:00
Yao Wei Tjong 姚伟忠
db5cb36057 Remove the quick fix now that the ABI is correctly detected for MinGW. 
Related to #872 and commit 6ca3bdbb1c.
 2015-10-28 19:15:59 +08:00
Ivan K
d53fc4b94b LOGINFO -> URHO3D_LOGINFO 2015-10-22 23:59:47 +04:00
Ivan K
31f3c9ab65 DEFINE_APPLICATION_MAIN -> URHO3D_DEFINE_APPLICATION_MAIN 2015-10-21 23:08:28 +04:00
Ivan K
4bcbae61fe HANDLER -> URHO3D_HANDLER 2015-10-21 21:49:02 +04:00
Ivan K
f02cd63437 OBJECT -> URHO3D_OBJECT 2015-10-21 11:12:45 +04:00
Hualin Song
da3848716c Correct the frameWidth and frameHeight 
We will get wrong values of frameWidth and frameHeight sometimes when we run SpritePacker without the option "-trim".
 2015-10-17 17:10:42 +08:00
aster2013
6bd1d77634 Add baseTypeName argument to OBJECT macro. 2015-10-11 22:17:55 +08:00
Lasse Öörni
2a223949aa Optionally move model's initial bone positions to bind pose (-bp argument). 2015-10-06 23:15:37 +03:00
Yao Wei Tjong 姚伟忠
5961b7f2d6 Always use file symlinks for dummy custom library targets. 
So that when in fallback mode, the post-build step will use copy_if_different for each individual file to avoid unnecessary file copying and triggering subsequent dependency to rebuild. Close #913.
 2015-10-06 11:40:36 +08:00
Yao Wei Tjong 姚伟忠
8652de217d Rename Source/Urho3D/Script to Source/Urho3D/AngelScript. 2015-09-27 16:06:49 +08:00
Lasse Öörni
07dab99469 Update Assimp to latest head from github. Closes #786. 2015-09-15 14:29:53 +03:00
Lasse Öörni
7356bdecfb Add API to Animation / AnimationTrack to create tracks and keyframes and expose it to script. Change AnimationTracks to be stored in a HashMap so that removal and creation is safe without invalidating pointers. Changed the AnimationTriggerPoint API to resemble the AnimationTrack API, and change it to be handled as a value type in AngelScript API. Closes #878. 2015-09-11 16:08:48 +03:00
Yao Wei Tjong 姚伟忠
c4a138ae4f Add new build option to allow host tool building to use native ABI. 
Possibly fix issue #872.
 2015-09-04 11:20:26 +08:00
Yao Wei Tjong 姚伟忠
353ee7f870 Remove force include as now export header is auto-included once again. 2015-09-03 22:40:13 +08:00
Yao Wei Tjong 姚伟忠
c2471a240a Reorganize includes for Samples and Extras. 
Since the URHO3D_PCH build option is made available to support non-PCH build, our build system does not rely on precompiled header to include the Urho3D.h export header anymore. The export header is auto-included by one of Urho3D headers when it is required using the right format with the help of URHO3D_IS_BUILDING compiler define. As such, there is no need to explicitly include Urho3D.h in external project too. Sorry for the flip-flop.
 2015-08-27 18:07:20 +08:00
Lasse Öörni
44acf54118 Make sure the lowest bone influences are dropped if too many. 2015-08-18 21:58:24 +03:00
Lasse Öörni
b631612ff7 Force normalization of vertex weights in AssetImporter. More than 4 weights is no longer a fatal error, instead any more than that are dropped and a warning is logged. 2015-08-18 19:27:25 +03:00
Yao Wei Tjong 姚伟忠
5fb6482e14 Add dependent C++ source file when building PackageTool for Emscripten. 
[ci only: Emscripten]
 2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
7a80b37c22 Fix URHO3D_PACKAGING build option on Windows platform with SHARED lib. 
[ci scan]
 2015-07-12 19:04:19 +08:00
Yao Wei Tjong 姚伟忠
fa77a456f8 Reformat Urho3D source files to get rid of the indents on empty lines. 
Reorganize includes.
Misc. fixes to perform explicit C-style cast on type mismatch.
Misc. fixes on bugs identified by CLion's static analyzer.
 2015-07-07 23:43:56 +08:00
Yao Wei Tjong 姚伟忠
6923bd0736 Install tools to the 'bin/tool' directory. 
Related to commit 6b6447eb8c.
 2015-06-10 18:39:39 +08:00
nemerle
a779d56c82 Fix lightmap texture imports - likely copy-paste error 2015-06-06 21:11:01 +02:00
ninjastone
c984c18a8b removed unused lines 2015-06-01 00:32:02 +09:00
ninjastone
d0fea4abd3 Fixed: AssetImporter was not importing single keyframe animation correctly. 2015-05-31 23:37:14 +09:00
Yao Wei Tjong 姚伟忠
be2280918b Adjust .gitignore to filter generated stuff in non out-of-source build. 
Related to #716. [ci skip]
 2015-05-18 22:33:55 +08:00
Yao Wei Tjong 姚伟忠
dfab28fed6 Fix iOS host-tool building for Urho3D_universal target. 
For Travis CI - when releasing disregard commit message instruction from the last commit being tagged. This is to ensure all CI jobs are run for releasing the artifacts.
[ci package]
 2015-05-15 19:21:25 +08:00
Lasse Öörni
f4b5ead164 On D3D11 & OpenGL3, convert luminance & luminance-alpha textures to RGBA on upload. Revert RampGenerator & Spot/SpotWide texture changes to use RGB format. Closes #718. 2015-05-06 17:23:10 +03:00
Ali Kämäräinen
8332e68f56 Improve AssetImporter error print. 2015-04-13 10:17:22 +03:00
Yao Wei Tjong 姚伟忠
41d9ab29a9 For Travis CI - add CI build jobs for Direct3D 11. 
Fix Emscripten build due to earlier faulty fix on MinGW build to support building of PackageTool for both host and target systems.
 2015-03-30 23:02:01 +08:00
Yao Wei Tjong 姚伟忠
6125f08716 Fix MinGW build when PackageTool is built for both host and target. 2015-03-30 20:47:13 +08:00
Lasse Öörni
b8c7c59eca Configure amount of allowed bones for hardware skinning based on the rendering API. Allow 128 bones on Direct3D 11 & OpenGL 3. Add -mb (maxbones) parameter to AssetImporter & OgreImporter. When using OpenGL 3, allow deferred rendering to use different MRT formats without forcing an RGBA substitute rendertarget. 2015-03-21 23:22:08 +02:00
Lasse Öörni
006c17f78e Added command line & engine startup option to disable OpenGL 3. 2015-03-17 20:44:49 +02:00
Lasse Öörni
785df863e4 Save spot textures generated by RampGenerator as RGB. 2015-03-12 21:39:28 +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 姚伟忠
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
0c48c9df87 Fix Assimp to not give negative light direction. Fix FOV handling for spot lights in AssetImporter. Added error prints to Editor if fails to execute AssetImporter. Closes #669. 2015-02-24 12:19:25 +02:00
Lasse Öörni
88080dad31 Remove Shader Model 2 mode & instancing without stream offset (D3D9) as they are hard to test. Added Graphics::GetApiName() function. 2015-02-21 20:53:12 +02:00
Yao Wei Tjong 姚伟忠
00410603a1 Do not install NinjaSnowWar.sh and Editor.sh for Emscripten build. 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
a77e24d8ad Enable external project macro users to find and use PackageTool. 
Adjust software packaging for Emscripten.
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
85c893a83d Attempt to enable CI build for Emscripten. 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
a66df72ff5 Fix host tool building and relinking dependency. 
Also fix an issue with CMake reconfiguration where the internal cache work against the regeneration of the custom RESOURCE_CHECK target.
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
8471dcf3e4 Add option to package resource dirs and treat those dirs as build deps. 
Fix static library building using emar instead of ar (from host compiler toolchain).
 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
6e0ff48059 Suppress linker warnings. Minor doc update. 2015-02-13 21:23:05 +08:00
Yao Wei Tjong 姚伟忠
19ab396e74 Add new Emscripten/CMake toolchain file based on Urho3D convention. 
Use EMSCRIPTEN_ROOT_PATH environment variable to specify the root path to the emscripten, instead of the original EMSCRIPTEN environment variable exported in emsdk_set_env.sh.
This is because the original EMSCRIPTEN environment variable name clashes with our build scripts.
 2015-02-13 21:23:05 +08:00
Yao Wei Tjong 姚伟忠
96a3126557 Fix SpritePacker build on Mac OS X platform. 2015-02-10 00:49:52 +08:00
Lasse Öörni
4354b1709c Tabs to spaces and update copyright year. 2015-02-09 23:44:01 +02:00
Lasse Öörni
5ab72bf620 Merge remote-tracking branch 'friesencr/sprite_packer' 2015-02-09 23:40:09 +02:00
Chris Friesen
6f383f64df SpritePacker cli 2015-02-07 12:40:01 -06:00
Lasse Öörni
bb2ebf7568 Bump copyright to 2015. 2015-01-31 21:03:53 +02:00
Lasse Öörni
3115f08265 Enforce Urho3DPlayer command line format and only use the first argument as the script file name to avoid misparsing rest of the command line. See #628. 2015-01-22 11:27:54 +02:00
Lasse Öörni
6e5d0db379 If Urho3DPlayer command line is empty, attempt to read Data/CommandLine.txt on all platforms. Closes #615. 2015-01-20 12:42:53 +02:00
Yao Wei Tjong 姚伟忠
ed214bbeb3 Avoid the include dirs hack for finding the Urho3D.h header. 
It is now a library user own's responsibility to include the Urho3D.h in their source code. Or to include it as part of their own precompiled header similar to what Urho3D project has done.
 2015-01-20 18:15:29 +08:00
Yao Wei Tjong 姚伟忠
05dd995b85 Refactor all the codes and scripts to use the renamed 'bin' subdir. 2015-01-18 21:40:54 +08:00
Yao Wei Tjong 姚伟忠
1b2dcac1d2 Add new URHO3D_MACOSX_BUNDLE build option to build bundled apps on OSX. 2015-01-17 18:34:22 +08:00
Lasse Öörni
b6caeb02a5 Document depth rendering. Disable depth write when sampling a HW depth texture. Disable stencil optimizations when using a custom depth texture, as in that case stencil channel availability can't be guaranteed. Changed -renderpath command line option to use the full resource name instead of defaulting to the RenderPaths directory. Removed test code from ForwardHWDepth renderpath. Closes #597. 2015-01-10 15:54:00 +02:00
Lasse Öörni
6fc05e9373 Added support for defining custom depth-stencil textures in the renderpath, and performing depth-only rendering passes. Readded support for readable HW depth format (on D3D9 it uses the INTZ hack.) Improved RenderPath & Graphics Lua bindings. Added -renderpath command line option to specify the renderpath file to use. 2015-01-10 15:54:00 +02:00
Yao Wei Tjong 姚伟忠
35307869ee Clean up to remove unused CMake variables. 
LIBS is now defunct. No more dual purpose usage.
INCLUDE_DIRS_ONLY is renamed to INCLUDE_DIRS.
LINK_LIBS_ONLY is renamed to LIBS.
 2015-01-07 21:51:00 +08:00
Yao Wei Tjong 姚伟忠
359efb2d37 Move the DebugNew.h from Urho3D/Container subdir to Urho3D subdir. 2015-01-05 22:31:32 +08:00
Yao Wei Tjong 姚伟忠
b51e419c88 Change impl. file to include the header file from corresponding subdir. 
Change header file to use relative pathspec when including other files.
 2015-01-04 22:40:40 +08:00
Yao Wei Tjong 姚伟忠
1cbbb6b805 Finalize SDK-like include dirs clean up. Fix build using MSVC. 2015-01-04 22:32:41 +08:00
Yao Wei Tjong 姚伟忠
4feb135281 Clean up SDK include dirs. Refactor FindUrho3D CMake module. 
For Travis CI - add new steps to install the Urho3D SDK and to reference Urho3D library from the installed SDK.
 2015-01-04 22:32:41 +08:00
Yao Wei Tjong 姚伟忠
8e6fe0da14 Refactor LuaJIT build scripts - no more generated CMakeLists.txt. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
67e415acc8 Fine tune LuaJIT target arch detection logic. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
0af8a30650 Fix 32-bit LuaJIT build for Linux&OSX. Fix host tool building for iOS. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
4db162eb62 Lua/LuaJIT host tool building while cross-compiling in one go. 
For Travis CI - reenable CI build with Lua/LuaJIT build option turned on.
 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
f9cb911cec Fix AngelScript binding which broke MinGW and OSX CI build. 
Unify CMake module path setting command between Windows and non-Windows hosts for using library from SDK installation.
 2015-01-04 22:32:38 +08:00
Yao Wei Tjong 姚伟忠
d75c592bd2 Add new engine parameter to set the location of resource prefix path. 
Remove temporary measure instead use the new URHO3D_PREFIX_PATH environment variable to set the resource prefix path for testing the executables.
 2015-01-04 22:32:38 +08:00
Yao Wei Tjong 姚伟忠
d8a3b8b4f4 Make repo root is also CMake source tree for the Urho3D project. 
Build tree location is now fully user defined. The build tree location could also be the same as source tree, although it is not recommended.
 2015-01-04 22:32:38 +08:00
Lasse Öörni
52762aee5e More informative error message if submesh bone limit exceeded. 2014-12-08 13:51:27 +02:00
aster2013
25132bd4a0 ADD URHO3D_PHYSICS AND URHO3D_NAVIGATION OPTIONS. 2014-08-21 12:41:24 +08:00
Lasse Öörni
f3e18e6412 Make sure animation start time adjustment happens with tick conversion, tabs to spaces, some code reordering + added comments. 2014-07-16 19:13:04 +03:00
ninjastone
fc60d8de21 Fixed AssetImporter to adjust time of first key frame to 0. 2014-07-17 00:06:20 +09:00
ninjastone
42dc493f4a Skeleton only model was not importable 2014-06-18 23:50:25 +09:00
Lasse Öörni
001d57171b Add saving of assimp embedded textures to AssetImporter. Note that assimp itself does not yet support textures from inside FBX files. Closes #375. 2014-06-09 20:46:20 +03:00
Yao Wei Tjong 姚伟忠
96295b4923 Ensure the application logs are created in a writeable location. 
- Add a new function to get application preferences directory and expose it to scripting.
- Change Editor to save/load configuration file from the application preferences directory.
- Standardized the location of log files generated by Urho3DPlayer and samples. Ensure it is created in a user writeable location to prevent application locked up during closing.
 2014-05-24 12:16:18 +08:00
Yao Wei Tjong 姚伟忠
6ad8c14346 Add engine param for enabling touch emulation during initialization. 
Adjust sample base class to add screen joystick on desktop platform when touch emulation is enabled.
 2014-04-29 10:36:43 +08:00
Lasse Öörni
848ecce091 Merge remote-tracking branch 'remotes/friesencr/auto-load-folders' 2014-04-18 00:34:36 +03:00
Lasse Öörni
5b4da41b10 Code cleanup, renamed command line option. Updated AssetImporter documentation. 2014-04-17 15:07:35 +03:00
hualin
b946be1ff5 add an option for exporting the scene meshes even if they are identical with the others 2014-04-17 15:07:23 +03:00
Chris Friesen
873cef9840 Folders that autoload subfolders/paks on load 2014-04-16 22:27:31 -05:00
Lasse Öörni
9a7a9110a2 Added generated attribute documentation. Move AngelScript API dumping to a separate .cpp file. Hack fix for Doxygen parsing bug which would cause the Events page not to be recognized. Closes #303. 2014-04-13 01:45:27 +03:00
Yao Wei Tjong 姚伟忠
0425358f5c Fix GCC Makefile build on Mac OS X platform. 2014-04-12 19:31:19 +08:00
Yao Wei Tjong 姚伟忠
6298a15bf5 Cleanup to remove unused header file after the Console enhancement. 
[ci skip]
 2014-04-09 20:40:42 +08:00
Yao Wei Tjong 姚伟忠
3748375f67 Enhance Console class to support multiple command line interpreterers. 2014-04-09 17:13:04 +08:00
Yao Wei Tjong 姚伟忠
b504e9f2c6 Fix competing command line interpreters issue in Editor. 2014-04-08 12:17:44 +08:00
Yao Wei Tjong 姚伟忠
46285baf97 Refactor build scripts to group Urho3D specific build option. 
Initial support of project configuration and generation via cmake-gui.
 2014-04-05 00:20:56 +08:00
Lasse Öörni
2ac921de60 When editor is run from Urho3DPlayer, enable Lua if possible to allow editing Lua scripted scenes. Closes #294. 2014-04-03 10:45:24 +03:00
Lasse Öörni
35195939c1 Exposed allowed screen orientations (effective on iOS only currently) and the flush GPU setting as engine startup parameters. 2014-03-28 00:23:31 +02:00
Lasse Öörni
fb3306170e Material quality, texture quality, texture filter mode and anisotropy level as engine startup parameters and command line options. Closes #241. 2014-03-09 19:36:40 +02:00
Lasse Öörni
1941c508b4 Removed erroneous comment from View. Do not treat it a fatal error in OgreImporter if index optimization can't be done. 2014-03-08 17:03:58 +02:00
Lasse Öörni
abc6fcd8b8 Shader precaching mechanism. Call Graphics::BeginDumpShaders() or use the engine command line parameter -ds <file> to create a shader dump file of the variations that are loaded during program run, and Graphics::PrecacheShaders() to load the dump file. 
Moved GetShader() from Renderer subsystem to Graphics, which is more logical as loading shaders is a low-level operation, while Renderer should be concerned with high-level rendering of 3D scenes. Now eg. UI does not need to depend on Renderer at all.

Simplified internal state of ShaderVariation & ShaderProgram objects, the success of compile/link can be deduced from the presence of a non-null GPU object.

Fixed FILE_READWRITE mode to not clear the file contents, and to handle alternating reads and writes correctly.
 2014-02-16 22:23:07 +02:00
Lasse Öörni
381e9a04c3 Merge branch 'shader-refactor' 2014-02-05 20:54:56 +02:00
Daniel Wiberg
e2cf4d97de Fixed OgreImporter link problems on OS X 2014-02-05 00:51:46 +01:00
Lasse Öörni
85146c5317 Merge branch 'master' into shader-refactor 2014-02-04 11:30:03 +02:00
aster2013
4f91bf9307 Add support for compiled Lua file(with luc extension). 2014-02-03 21:10:56 +08:00
Lasse Öörni
caf080ecbb Initial refactoring of Direct3D9 shaders. ShaderCompiler removed. Bytecode not cached into files yet. 2014-02-02 14:54:46 +02:00
Lasse Öörni
6d5ddc23e0 Bump the copyright for 2014. 2014-02-01 14:37:21 +02:00
Lasse Öörni
d1a8f38e93 Return in Urho3DPlayer if the script language is not supported to prevent showing two error dialog boxes. 2014-02-01 14:37:20 +02:00
Yao Wei Tjong 姚伟忠
48eb0497df Rename var name from <package>_INCLUDE_DIR to <package>_INCLUDE_DIRS. 
See http://urho3d.prophpbb.com/topic9.html.
 2014-01-21 15:57:07 +08:00
Lasse Öörni
4f9287b7c8 Added AssetImporter options. Skip copy of zero-sized textures. In FileSystem::CopyFile(), do not overwrite destination file if opening the source file fails. Closes #129. 2014-01-18 16:15:38 +02:00
Lasse Öörni
a7d8f0fd18 Added reflection related functions to Plane. Fixed rendering a SkyBox from multiple views during the same frame. Better error message in ShaderCompiler if input file can not be opened. 2014-01-15 22:27:35 +02:00
Lasse Öörni
7fbefe6f43 Added AssetImporter option to restore earlier behavior, to flatten scene hierarchy in scene mode. 2014-01-15 01:08:51 +02:00
Lasse Öörni
604c8714aa Changed AssetImporter to save the relevant scene node hierarchy in scene mode, instead of just nodes containing meshes. 
Added node (prefab) save mode to AssetImporter.
Improved "Scene model" documentation page to mention scene load/save and prefab instantiation.
 2014-01-14 23:51:35 +02:00
Yao Wei Tjong 姚伟忠
e91307ce51 Clean up build scripts to adhere to format convention. 2014-01-13 17:36:00 +08:00
Lasse Öörni
56c91aa1a0 Added Assimp logging option to AssetImporter. 2014-01-08 15:47:59 +02:00
Yao Wei Tjong 姚伟忠
59b2b02888 Fix build using Urho3D as external library. Closes 112. 
Add test cases in Travis CI to test build using Urho3D as external library in external (non Urho3D) project.
 2014-01-07 22:03:32 +08:00
Yao Wei Tjong 姚伟忠
9f0ae5cea6 For Travis CI - add NinjaSnowWar into test cases. 2014-01-02 22:46:12 +08:00
Yao Wei Tjong 姚伟忠
0fb12e5883 For Travis CI - revert back call to make test pending investigation. 2013-12-30 08:32:44 +08:00
Yao Wei Tjong 姚伟忠
088eef9e60 Add simple test cases as part of the Travis CI build. 
Also fix Editor in case-sensitive platforms.
 2013-12-30 07:48:31 +08:00
Yao Wei Tjong 姚伟忠
d719baa38b Use on-demand shader evaluation for OpenGL as well. 
Also correct Urho3DPlayer usage help for setting log level. There is a space between parameter key and parameter value.
Other minor changes to correct formatting.
 2013-12-28 14:17:54 +08:00
Lasse Öörni
ffcbe42413 Evaluate shader combinations on demand. Closes #89. 
Fixed D3D9 window being borderless when it shouldn't be.
 2013-12-28 02:37:38 +02:00
Lasse Öörni
721f70fe1a Fixed D3D9 build. Added borderless as a command line option and documented it. 2013-12-28 00:49:06 +02:00
Lasse Öörni
8b8790e481 Added option to import non-skinning bones in AssetImporter. Closes #82. 
Added case-sensitivity option to String::Contains().
 2013-12-23 23:07:09 +02:00
Lasse Öörni
963fb9d753 Import material emissive color & texture in AssetImporter. 2013-12-22 20:54:08 +02:00
Lasse Öörni
32a9e72752 Fixed GLES low quality shadows. Fixed Android/iOS not initializing engine parameters from CommandLine.txt. 2013-12-16 11:54:58 +02:00
Lasse Öörni
f07a952096 Added second texcoord support in OgreImporter utility. 2013-12-13 19:03:05 +02:00
StevenZhang
a17baf2695 make AngelScript an optional module, you can use -DENABLE_ANGELSCRIPT=0 to disable it. 2013-12-02 19:02:39 +02:00
Lasse Öörni
026e838d5b Retired the unused DocConverter utility. 2013-11-30 16:53:25 +02:00
Lasse Öörni
ee8e8031d2 Rework command line options that need a parameter value to have a space in between. Fixes #44. 2013-11-12 01:33:15 +02:00
Yao Wei Tjong 姚伟忠
a27560c719 Enhance ScriptCompiler to also dump API as C Header file. 
The C Header file is intended to be 'force included' in the IDE to get content assist / code completion when editing AngelScript file in the C/C++ editor. The output section of DumpAPI() method is reordered slightly to keep the parser happy. This work is inspired by the work done by Vladimir Andri (see https://groups.google.com/forum/#!topic/urho3d/8WOOGAdwlEU).
 2013-11-08 12:41:21 +08:00
Lasse Öörni
cfa6b135ce Moved Urho3DPlayer class definition to a .h file. Updated documentation to refer to Urho3DPlayer. 2013-11-04 19:07:00 +02:00
Yao Wei Tjong 姚伟忠
c1480abfb8 Rename Urho3D script host app from "Urho3D" to "Urho3DPlayer". 2013-11-04 19:36:36 +08:00
Lasse Öörni
c057b29dba Unify how command line options are shown in utilities. 
Added note in documentation about lack of space between command line option and its parameter.
Prepend Materials/ to the material list written by OgreImporter (assume "standard" materials subdirectory.)
 2013-10-30 18:49:27 +02:00
Lasse Öörni
b957f60143 Added ApplyMaterialList() function to StaticModel so that the feature can be used outside the editor as well. Refactored editor to use that function instead of its own implementation. 
Unified the switch to output material list to -l in both AssetImporter & OgreImporter.
Removed the "use local IDs" toggle from editor as that can be specified with the import options.
 2013-10-29 23:04:51 +02:00
Lasse Öörni
8077ee4a53 Added option to OgreImporter to save material list file next to the model. 2013-10-28 21:35:53 +02:00
Yao Wei Tjong 姚伟忠
e423a26461 Refactor CMake build scripts. 
Changes:
- Avoid globbing engine source files twice.
- Setup folder group for VS and Xcode. Also group object files according to 3rd-party library name.
- New define_source_files() macro.
 2013-10-28 18:21:18 +08:00
Yao Wei Tjong 姚伟忠
ef566d825a Cleaned up build script script comment. 2013-10-25 00:08:49 +08:00
Lasse Öörni
02df5b2d02 Write package file size to the end of package files. If package signature is not found from the file beginning, seek to file end and read the size, then seek backward to check if the package file is concatenated eg. in the executable. Alternatively the start offset can be specified manually when opening a package file. Closes #27. 2013-10-24 00:06:19 +03:00
Yao Wei Tjong 姚伟忠
a9ed330890 Create sub-projects for Samples/Tools/Extras. 2013-10-22 23:19:03 +08:00
Lasse Öörni
0eb45c0960 Fixed ShaderCompiler build. 2013-10-21 23:59:21 +03:00
Yao Wei Tjong 姚伟忠
d33ac02538 Refactor build scripts to build Urho3D library as main target. 
Other changes in the commit:
- Change build option from URHO3D_BUILD_TYPE to URHO3D_LIB_TYPE. Default value is STATIC.
- Automatically add compiler definition 'URHO3D_STATIC_DEFINE' when linking with Urho3D library statically.
- Move LuaScript subsystem from Extra/ to Engine/.
- Enable FindUrho3D module to also detect Urho3D library target when the FindUrho3D module is being used internally by Urho3D project.
- Configure to build all the samples for iOS and Android platforms also when option to build samples is enabled.
- Export all the Register*Library() global functions.
- Rewrite all the tools, samples, and extras targets to link against Urho3D library.

TODOs:
- Combine engine sub-libraries into one.
- Test builds on non-Linux platforms.
 2013-10-21 02:28:29 +08:00
Lasse Öörni
c6a6f71aa3 Finalize LZ4 support. Do not repeatedly allocate compressed data buffer. Do not store global blocksize into the package file header. Increased Android read buffer to 32KB. 2013-10-12 15:03:17 +03:00
Lasse Öörni
30ce75fd68 LZ4 compressed package file support. Closes #6. 2013-10-12 15:03:17 +03:00
weitjong
633a7f4804 Renamed IOS and Mac OS X framework macros. 
These macros may be used later not just to setup frameworks but also
other linker flags.

Renamed setup_ios_frameworks    -> setup_ios_linker_flags.
Renamed setup_macosx_frameworks -> setup_macosx_linker_flags.
 2013-10-07 00:12:01 +08:00
Aster Jian
4b9f241065 Add LuaFunction class, Add more Lua API in Sound, fixed typo. 2013-09-26 16:18:38 +00:00
Lasse Öörni
41f627b230 Fixed Urho3D.cpp compile error on VS2008. 
Re-entrancy safety for StaticModelGroup::OnWorldBoundingBoxUpdate(): do not resize the worldTransforms_ vector. Instead set maximum size beforehand.
Do not make group mode light as bright in HugeObjectCount so that text remains easier to read.
 2013-09-19 07:28:18 +00:00
Wei Tjong Yao
e376dc4562 Identity the maintainer of the Urho3D/Lua fork. Regenerate toluabind.c and toluabind.h using bootstrap process. Only call 'standard' script functions when they are available and be silent about it when they are not defined in the Lua script. 2013-09-18 21:49:04 +00:00
Lasse Öörni
dcb39bf810 Add note of Direct3D9 bool shader constants possibly having no effect. 
Add support for Color shader parameters inside a Variant (same as Vector4.)
Parse bool shader parameters in Material & RenderPath.
 2013-09-15 23:42:59 +00:00
Lasse Öörni
4ce67126e2 Unversioned the SM2/SM3 shader bytecode destination directories. These are instead created by ShaderCompiler on demand. 2013-09-06 06:51:08 +00:00
Lasse Öörni
372fbed88d Normalize resource names in SanitateResourceName() if they also contain a registered resource dir name, ie. Data/Scripts/NinjaSnowWar.as becomes Scripts/NinjaSnowWar.as. This fixes script file possibly getting loaded twice. 
Fixed renderer raycasts returning wrong distance.
Added caseSensitive parameter to several String functions.
Added option to convert file extension to lowercase in GetExtension() and GetFileNameAndExtension() functions.
Removed unnecessary lowercase conversion of extensions, and complicated string compare logic.
 2013-09-05 14:57:45 +00:00
Wei Tjong Yao
6bef92973d Avoid hardcoding of highlighted console text style. Console subscribes to handle log message only when it itself is ready to do so. Removed redundant row container vector in the Console class. Hide the Console's linedit and preventing it to gain focus when there is no AngelScript or LuaScript subsystem to handle the E_CONSOLECOMMAND event. Fixed UIElement to send E_ELEMENTREMOVED event for RemoveChildAtIndex() method. Fixed Sample.lua to handle the ESC key to dismiss the Console when it is visible. 2013-09-05 08:55:05 +00:00
Lasse Öörni
7f64104825 Added -p command line argument, which specifies resource paths to use. 
Added IsAbsolutePath() function to FileSystem.
Removed unnecessary double error message from ResourceCache.
 2013-08-30 11:03:07 +00:00
Wei Tjong Yao
59b5967910 Simplify the build script as ABSOLUTE_PATH_LIBS variable works both ways. 2013-08-29 09:40:35 +00:00
Wei Tjong Yao
643f066179 Use the ABSOLUTE_PATH_LIBS variable instead if the library is found. Just in case the library is found in a path that contains keywords that may be stripped. 2013-08-29 09:11:25 +00:00
Lasse Öörni
1674447226 Use absolute path of d3dcompiler library. 
Fixed compiling when Direct3D SDK is not found.
 2013-08-29 08:09:29 +00:00
Wei Tjong Yao
c3ea4d7a85 Adjusted Android logging level in SDLActivity java class. Added compiler flag for RASPI build to suppress warning spam about mangling of va_list. Cleaned up header includes in Urho3D class. 2013-08-29 06:34:12 +00:00
Lasse Öörni
dee404c133 Removed unnecessary conversion step from RampGenerator. 2013-08-25 15:53:19 +00:00
Wei Tjong Yao
ddc3670238 Attempt to fix MinGW build and some other code cleanup. 2013-08-11 14:30:22 +00:00
Wei Tjong Yao
02512cecf9 In order to move the out-of-source 'build' directory back to Urho3D project root directory, all the source codes sub-directories are now moved down one level to a new directory under project root called 'Source'. 2013-08-09 10:29:22 +00:00