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

283 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
9f19d51c08 Remove older constructs that have been earmarked previously. 2017-03-05 08:34:41 +08:00
Yao Wei Tjong 姚伟忠
3475afba54 Bump the CMake minimum version in the CMakeLists.txt files. 2017-03-05 08:34:41 +08:00
Lasse Öörni
540404bee2 Minor refactor for .ies extension detection. 2017-02-18 22:42:07 +02:00
JSandusky
306daeded5 Change sigma table naming to fit conventions 2017-02-09 13:16:42 -05:00
JSandusky
7a3ddb11ee JS: Add IES cookie generation to RampGenerator 2017-02-09 00:48:19 -05:00
Lasse Öörni
97b594de36 Fix assigning of global animation start/end time variables which would have unintended consequences when saving multiple animations. Closes #1789. 2017-02-01 13:59:42 +02:00
Lasse Öörni
bd95787c1a Fix Web build Urho3DPlayer not reading script file name from Module.arguments. Make sure the error exit due to no script name happens. 2017-01-11 14:56:54 +02:00
Lasse Öörni
0e1e46fbb9 Refactor Urho3DPlayer to attempt reading CommandLine.txt from the resource system later on all platforms, if reading from the filesystem fails. Closes #1754. 2017-01-10 20:13:59 +02:00
Yao Wei Tjong 姚伟忠
d42723a45e Enable high DPI on Apple retina display device by default. 
High DPI mode can still be programmatically disabled via Engine parameter only.
 2017-01-10 23:43:03 +08:00
urho3d-travis-ci
ee054a1507 Travis CI: bump copyright to 2017. 
[ccache clear]
 2017-01-01 13:01:31 +00:00
Lasse Öörni
f65ca809e2 Merge remote-tracking branch '1vanK/master' 2016-12-10 15:22:28 +02:00
1vanK
2a703a5ab1 Add engine parameters const 2016-12-10 08:18:18 +03:00
Yao Wei Tjong 姚伟忠
f1d1b757b8 Change all CMakeLists.txt to use LF for consistency sake. 2016-12-05 22:33:59 +08:00
Johnathan Jenkins
d78fc4020f minor typos 2016-10-28 13:07:14 -07:00
Lasse Öörni
3bf13318fc Sync Urho3DPlayer command line help from the documentation. 2016-10-18 22:49:13 +03:00
Lumak
4fd62537e6 implemented a much simpler version 2016-09-19 00:40:17 -07:00
Lumak
7341c9a48b a bit of clean up 2016-09-18 14:42:26 -07:00
Lumak
931b9bbd98 added a feature to be able to export fbx animation w/o skinned mesh 2016-09-18 13:12:49 -07:00
Igor
c72ea82b5f fix delete in SpritePacker.cpp 2016-09-12 12:29:52 +03:00
Yao Wei Tjong 姚伟忠
13ed7bbbb6 Workaround a linking issue when using MinGW >= 6.1.0. 2016-09-04 12:02:05 +08:00
Lasse Öörni
773ba488ea Merge pull request #1550 from Lumak/master 
fixed a bug where crash is caused by geometry having key animation
 2016-08-31 12:45:54 +03:00
Lumak
79f1a1bdcd added a check for invalid boneIndex caused by geometry key animation 2016-08-30 10:19:43 -07:00
Lumak
d7085d2c7c copy and paste edit 2016-08-30 09:06:56 -07:00
Lumak
a1aa049e2f fixed geometry having animation key problem 
a geometry being animated causes crash because the suppression looks for
a parent bone
 2016-08-30 08:44:12 -07:00
Lasse Öörni
9df9a5c77c Add new AssetImporter flag to Doxygen docs. 2016-08-24 17:32:54 +03:00
Lumak
3af3c2b695 fixed channelIndices[] indexing in ExpandAnimatedChannelKeys() func. 
-and removed dbg dump code
 2016-08-22 21:48:39 -07:00
Lasse Öörni
dc2acfdf6e Minor typo, code convention and whitespace fixes. 2016-08-22 21:32:50 +03:00
Lumak
9636bba26d corrected copying scalingkey in ExpandAnimatedChannelKeys func. 2016-08-22 08:59:41 -07:00
Lumak
501dc3b364 max compile error fix 2016-08-22 07:58:25 -07:00
Lumak
dbd6465169 added assetimporter feature to suppress $fbx nodes 2016-08-22 07:34:43 -07:00
Lasse Öörni
939e7c9fd3 Revert "String + number operator". Remove String + operator with char parameter to prevent accidental truncation and replace with string literal concatenation where needed. 
This reverts commit fafd921f32.
 2016-08-07 18:18:27 +03:00
Yao Wei Tjong 姚伟忠
7c90c2c0ec Simplify command to detect predefined macros of the chosen compiler. 
Add new CMake module for detecting host capability.
 2016-08-03 00:16:23 +08:00
Yao Wei Tjong 姚伟忠
ccd9dac3c7 Also enable AS wrapper when targeting 64-bit ARM platform. 2016-06-05 22:42:01 +08:00
Lasse Öörni
96451d891e Use the proper form of EMSCRIPTEN define throughout. 2016-06-04 12:33:02 +03:00
Lasse Öörni
fb508365af Fix logic for getting the script file name in web Urho3DPlayer in case arguments were already specified and the command line file is not used. 2016-06-04 12:26:36 +03:00
Lasse Öörni
f097224968 Avoid hardcoding the script file name on web platform Urho3DPlayer. Rather attempt to read from CommandLine.txt later once resources are initialized. Setup a default windowed resolution to match the executable web samples. 2016-06-04 00:21:54 +03:00
Lasse Öörni
98dfaf3c75 Add Boost Preprocessor library to Source/ThirdParty. Force C++11 for AngelScript / Emscripten combo. Default to CharacterDemo instead of NinjaSnowWar in Urho3DPlayer on Emscripten due to missing Network subsystem. 2016-06-02 20:55:52 +03:00
Lasse Öörni
0803320a9a Remove mention of AngelScript not being supported on Emscripten. Leave the generic call convention autohandle fix on at all times, since it doesn't hurt. Clarify CommandLine.txt not being able to be read on Emscripten. 2016-06-02 19:27:15 +03:00
nathan
618b37519a Fixed indentation of my change to Urho3DPlayer.cpp hardcoding NinjaSnowWar.as for the EMSCRIPTEN build. 2016-05-31 00:37:34 +02:00
nathan
d7b0604d93 Made Angelscript work on the Emscripten build. Not thoroughly tested!!! 
-Has been tested by running Urho3DPlayer with the 12_PhysicsStressTest script
 (the file copied in place of NinjaSnowWar.as requested)
-built with "-std=gnu++14 -I/usr/include/boost" for the CMAKE_CXX_FLAGS
 and "-I/usr/include/boost" for the CMAKE_C_FLAGS.
  ** /usr/include/boost contains a simlink pointing to itself so that boost/
     preprocessor____ can be found
-Networking still doesn't work, so NinjaSnowWar shouldn't work
-Debug builds did not work for me: see http://urho3d.prophpbb.com/topic2151.html
-Defining FORCE_AS_PORTABLE can be used to force it to use the generic build
 with, for example, a gcc build (which should allow more apples-to-apples
 testing of the efficiency of the bindings)
-Discussion of this work originally at http://urho3d.prophpbb.com/topic2044.html
 2016-05-30 22:32:48 +02:00
Yao Wei Tjong 姚伟忠
d15553fce9 Fix building of PackageTool target due to inclusion of new class. 2016-05-21 12:02:53 +08:00
Lasse Öörni
5d71f8012a Update documentation. Skip material / texture save in AssetImporter "anim" mode. 2016-05-18 16:24:54 +03:00
svifylabs
d304d941d1 Add import only animation 2016-05-18 09:50:12 +02:00
Yao Wei Tjong 姚伟忠
4f72a673d9 Fix the compression ratio calculation. Suppress compilation warnings. 2016-05-14 22:57:14 +08:00
Yao Wei Tjong 姚伟忠
c28634c206 Minor enhancement on the PackageTool to have output option. 2016-05-14 15:07:14 +08:00
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