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

10202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
urho3d-travis-ci
1b36be0115 Travis CI: API documentation update at 2014-07-25 14:57:16 UTC. 
[ci package]
 2014-07-25 14:57:16 +00:00
Lasse Öörni
52661d18dc Merge pull request #411 from urho3d/threaded-resource-load 
Background loading of resources
 2014-07-25 17:37:50 +03:00
Lasse Öörni
af46a915c2 Protect AngelScript module creation/deletion with a mutex as AngelScript itself doesn't do that. 2014-07-25 16:56:05 +03:00
Lasse Öörni
cbe440db52 Fixed typo in comment. Added profiling blocks for finding the scene resources to preload. 2014-07-25 02:27:08 +03:00
Lasse Öörni
4f1906d598 Fix missing include file. 2014-07-24 23:48:03 +03:00
Lasse Öörni
d93fdb5aa4 Fix texture reload when device is initially lost. 2014-07-24 23:44:38 +03:00
Lasse Öörni
ad737e0d6e Documentation for background resource loading. Expanded Scene::LoadAsync() to either background load resources only, load scene + resources synchronously, or background load resources first, then load the scene. Closes #406. 2014-07-24 22:45:31 +03:00
Lasse Öörni
33b15ebc31 Clean up ResourceCache template functions. 2014-07-24 17:24:24 +03:00
Lasse Öörni
be66059009 Refactor resource background loading into a separate class. 2014-07-24 17:23:00 +03:00
Lasse Öörni
80fa911066 Fixed recording of background loaded resource's dependencies so that unnecessary waits do not occur when finishing the resources. 2014-07-24 02:20:06 +03:00
Lasse Öörni
8c0cc2f916 Disregard background load request with empty name. 2014-07-24 01:24:45 +03:00
Lasse Öörni
e210ef20b2 Fix deadlock when waiting for a resource that is background loading but is now needed immediately. 2014-07-24 01:21:51 +03:00
Lasse Öörni
3c7126de38 Asynchronous loading for AnimationSet2D. 2014-07-23 21:55:32 +03:00
Lasse Öörni
3703658f66 Asynchronous loading for Sprite2D & SpriteSheet2D. 2014-07-23 20:06:05 +03:00
Lasse Öörni
5450b1d111 Asynchronous loading for ParticleEffect2D. 
Correctly store material dependency when async loading ParticleEffect.
 2014-07-23 17:49:14 +03:00
Lasse Öörni
677ab20986 Asynchronous loading for ParticleEffect. 2014-07-23 17:28:20 +03:00
Lasse Öörni
21053067bd Asynchronous loading of ScriptFile. Due to possibly accessing arbitrary engine functionality in script initializers the actual script compilation cannot be threaded even if AngelScript itself is compiled as thread-safe. Furthermore AngelScript allows only 1 simultaneous compile, and the resource loading system is not prepared to fail and retry in that case. 2014-07-23 17:19:44 +03:00
Lasse Öörni
d986ec7d25 If loading a Model synchronously, read directly into the buffers like before to avoid extra allocation & copy. 2014-07-23 16:27:29 +03:00
Lasse Öörni
2b2b500892 Asynchronous loading for Model. 2014-07-23 16:16:06 +03:00
Lasse Öörni
8ab908b1c9 Configurable max work time in ms per frame for finishing background loaded resources, and for non-threaded work in WorkQueue. Fix iteration bug if finishing several background loaded resources in one go. 2014-07-23 15:11:45 +03:00
Lasse Öörni
cdd2dae4fb Precalculate texture's mip levels during async loading, if applicable. Use a timer to avoid spending too much time per frame on finishing async loaded resources. 2014-07-23 14:29:39 +03:00
Lasse Öörni
9bee27f0bd Merge branch 'master' into threaded-resource-load 2014-07-23 13:39:08 +03:00
Lasse Öörni
d5cfcd493b Further fixes for threaded drawable updates: ensure drawables per workitem > 0, do not update bounding boxes threaded as they may not be correct in case of hierarchical composition. 2014-07-23 13:29:59 +03:00
Lasse Öörni
3181986f82 Log message for finalizing a background loaded resource. 2014-07-23 13:22:47 +03:00
Lasse Öörni
f194765e78 Background loading of Materials. 
Store dependencies of 3D & cube textures so that they will be properly live reloaded if the individual images change.
 2014-07-23 02:04:28 +03:00
Lasse Öörni
df67ccdac7 Merge branch 'master' into threaded-resource-load 2014-07-22 22:33:43 +03:00
Lasse Öörni
4a9ab417a8 As a possible fix to #409, remove the optimization to not mark a node dirty again if it is already dirty. As a consequence the TransformChanged() script function will work more logically. This change would cause reduced performance with a large amount of animating models; to counteract, introduce a "silent update" mechanism for node transforms. 2014-07-22 22:20:14 +03:00
Lasse Öörni
37bb1e64cc Removed debug print from the material editor. 2014-07-22 20:20:03 +03:00
urho3d-travis-ci
92872df9b8 Travis CI: API documentation update at 2014-07-22 14:07:16 UTC. 
[ci package]
 2014-07-22 14:07:17 +00:00
Lasse Öörni
d60ca10c8f Restore Drawable base attributes to ParticleEmitter. Closes #407. 2014-07-22 16:50:24 +03:00
aster
4f0893cf37 Create all timeline nodes. 2014-07-22 18:08:57 +08:00
Chris Friesen
5a8910c16c Editor: Update resource browser for particle emitters 2014-07-22 03:43:30 -05:00
Lasse Öörni
8463393377 Initial resource background loading API and implementation. Background loading-capable implementation for textures (load image in background thread, upload image to GPU in main thread), other resources todo. 
Allow dynamically created profiler block names by copying the name C string.
Texture Load() function with image pointer renamed to SetData() to not confuse with the threaded/nonthreaded resource loading functions.
 2014-07-22 01:30:02 +03:00
Yao Wei Tjong 姚伟忠
2b05124ff6 Fix the wrong bash if syntax for checking the existence of perl tool. 2014-07-21 22:05:53 +08:00
Yao Wei Tjong 姚伟忠
85b1095fdf Also allow skipping of dSYM generation for external project. 
This should make incremental build using Debug configuration much faster during development.
 2014-07-21 20:11:40 +08:00
Yao Wei Tjong 姚伟忠
f8b1b2cc24 Speed up Debug configuration iOS build by skipping dSYM generation. 
Other build configurations still use iOS default, i.e. dwarf-with-dsym.
 2014-07-21 14:50:29 +08:00
Yao Wei Tjong 姚伟忠
18bf6484cf For Travis CI - wrap package installation steps with 'travis_retry'. 
Occasionally package installation could fail due to timed out or other unknown one-off network issue, using 'travis_retry' wrapper to retry the installation should fix this.
 2014-07-21 11:08:43 +08:00
Lasse Öörni
840143eb00 Protect some ResourceCache structures with a mutex so that eg. GetFile() or GetTempResource() can be called from worker threads. Verify that GetResource() is only called from the main thread. 2014-07-20 23:16:23 +03:00
Lasse Öörni
461a61319f Allow logging from outside the main thread. These log messages are collected and handled at the end of frame. 2014-07-20 22:08:41 +03:00
Lasse Öörni
346da1e1f9 Detect main thread when sending events or using profiler blocks; make these no-ops when called from outside the main thread. 2014-07-20 21:32:55 +03:00
Lasse Öörni
f3024b9f4b Added GetCurrentThreadID() static function to Thread. Store the thread which created the Context. 2014-07-20 21:30:39 +03:00
Lasse Öörni
d508eb51cb Use SDL_GetPrefPath also for the crashdump location. 2014-07-20 19:07:23 +03:00
Lasse Öörni
1f521713e7 Do not store Image resources used during cube/3D texture loading permanently to cache. 2014-07-20 18:37:34 +03:00
Yao Wei Tjong 姚伟忠
c26038fe05 Attempt to fix the MinGW failed build due to linker runs out of mem. 
Add -fno-keep-inline-dllexport compiler option when building using MinGW in order to reduce the object size and the link time (and thus hopefully reduce the linker memory consumption as well).
 2014-07-20 19:39:05 +08:00
aster
7b79fb972c Fix bug in RigidBody2D. 2014-07-20 18:01:29 +08:00
Yao Wei Tjong 姚伟忠
f7329aa83f Replace with a more proper derived CMake variable for easier maint. 
Add short comment on the intent of setting up RPATH.
 2014-07-20 13:43:15 +08:00
Chris Friesen
377c1d3fd1 Set editor camera mask to -1 2014-07-19 10:09:46 -05:00
Chris Friesen
62655920b8 Editor: Use viewport callbacks to hide gizmo 2014-07-19 08:55:33 -05:00
Yao Wei Tjong 姚伟忠
91c489bdfb Setup RPATH for Mac OS X. Adjust soversion to keep Apple linker happy. 
Set CMake policy CMP0042 to NEW for early CMake 3.0.0 adopters to prevent warning message when generating Urho3D project file.
 2014-07-19 21:23:11 +08:00
Yao Wei Tjong 姚伟忠
88919f22f7 Setup soversion for Urho3D library and setup RPATH settings for Linux. 2014-07-19 17:46:41 +08:00