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

9612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
c5278a8649 On a Visual Studio build, do not copy .obj files for the Urho3D library but use them from their original location. 2013-10-21 23:32:28 +03:00
Yao Wei Tjong 姚伟忠
7b24807c32 Combine Engine sources into one place and build as a single target. 2013-10-22 04:16:22 +08:00
Yao Wei Tjong 姚伟忠
2b3af05f26 Added license notice. 2013-10-21 22:39:16 +08:00
Yao Wei Tjong 姚伟忠
d953b36d62 Reverted back decision to also build samples on Android platform. 
Although samples should also work for Android platform, currently there is no available mechanism to package each sample app into individual *.apk.
 2013-10-21 20:27:08 +08:00
Yao Wei Tjong 姚伟忠
9070746b56 Fix Xcode AssetImpoter linker error caused by both freetype and assimp emitting same symbols. 2013-10-21 19:36:41 +08:00
Yao Wei Tjong 姚伟忠
07f81edc6f Explicitly specify a base name for the export header generation. 
The library target is renamed from "Urho3D" to "Urho3D_lib" as it clashes with "Urho3D" target for script host application. The library target's output name is then adjusted back "Urho3D" in the macro to generate "libUrho3D.a" or "libUrho3D.so" or "Urho3D.dll", etc. However, it seems that generate_export_header() macro provided by CMake does not taken into consideration of the adjusted target's output name property. Fortunately, it accepts a BASE_NAME argument to rectify the problem cleanly.
 2013-10-21 15:46:55 +08:00
Lasse Öörni
d560675985 Fix static lib build define. 2013-10-20 23:08:28 +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
5fb42a277c Re-added "flush GPU command buffer" -feature for controlling timestep variance and input lag. Direct3D only for now. Default off, as can decrease performance. 2013-10-20 21:02:19 +03:00
Lasse Öörni
2ab9fa5429 Merge remote-tracking branch 'remotes/szamq/master' 2013-10-20 12:36:26 +03:00
Lasse Öörni
fe14af594f Added documentation section on Lua garbage collection. 2013-10-20 12:12:18 +03:00
Paweł Mogiła
d392e9e031 Possibility to set more last timesteps(20) and don't use timestep smoothing, until got full vector 2013-10-20 02:06:03 +02:00
Lasse Öörni
db3bf3fbf9 Added timestep smoothing to Engine. By default the previous 2 frames' timesteps are averaged. 2013-10-19 22:51:47 +03:00
Yao Wei Tjong 姚伟忠
2af7dbdcd9 Move tolua++ add_subdirectory instruction from main to LuaScript. 
This should be part of commit 5dbf83c418.
 2013-10-20 00:14:00 +08:00
Yao Wei Tjong 姚伟忠
5dbf83c418 Show a warning message when tolua++ tool is missing. 
For cross-compiling to be successful, all the tools must be already built natively.
 2013-10-19 23:58:23 +08:00
Yao Wei Tjong 姚伟忠
c37ac56ec3 Added license notice. 2013-10-19 22:24:25 +08:00
aster2013
99b4315386 Chanage SharedPtr<T>, please use SharedPtr<T>::Get() to get raw pointer. add Read chunk function in Deserializer class, add Write chunk function in Serializer. 2013-10-19 10:19:28 +08:00
aster2013
27f7a2b31f Add more vector type support in Lua, rename ToluaUrho3DEx file to tolua++urho3d. 2013-10-18 22:04:36 +08:00
aster2013
4e0df133c0 Add "const Vector<String>" support in Lua, now in Lua "const Vector<String>" is a Lua table with string elements. 2013-10-18 20:39:47 +08:00
aster2013
d83f982c57 Change const string reference to const string type. 2013-10-17 23:25:01 +08:00
aster2013
747ab13932 Adjust lua gc step pause parameter, make it gc aggressive. 2013-10-17 23:03:33 +08:00
aster2013
6ae4ab9b7f Add SharedPtr<HttpRequest> support in Lua. 2013-10-17 21:42:35 +08:00
Lasse Öörni
b935b544de Do not check for HttpRequest error on initialization, as the connection init is performed in a background thread and is not immediately ready. 2013-10-17 15:41:00 +03:00
Lasse Öörni
0210a049b2 Block HttpRequest::Read() if not all data is received and connection is still open. This is to allow the other ReadXXX() functions to work properly. Only call Read() with size at or below GetAvailableSize() to ensure no blocking. 2013-10-17 15:03:22 +03:00
Lasse Öörni
0b938bf1ae Further iOS FreeType fix. 2013-10-17 13:12:07 +03:00
Lasse Öörni
9667886273 Restored the previous architecture check for whether to use arm assembly in FreeType. 2013-10-17 12:18:45 +03:00
Lasse Öörni
d1c547d455 Fixed to correctly use Time::Sleep() instead of Sleep(). 2013-10-17 11:48:15 +03:00
Lasse Öörni
0c86370485 Fix script warning in cmake_macosx.sh. 2013-10-17 11:41:45 +03:00
Lasse Öörni
2313bbbb2e Fix editor not finding NavigationMesh components from scene child nodes. 2013-10-17 10:33:01 +03:00
Lasse Öörni
e575d89882 Fixed billboard shader code to consistently camera-orient the billboards. 2013-10-17 01:40:54 +03:00
Lasse Öörni
2a5bea6bed Always merge the node's own world position to a BillboardSet bounding box. 2013-10-17 00:46:17 +03:00
Lasse Öörni
dc0533e1ae Fix forceAutoHint_ being uninitialized. 2013-10-17 00:32:25 +03:00
Lasse Öörni
347b840b7c Read HttpRequest in a background thread to prevent blocking. Always check all triangle mesh geometries for the closest hit in the RAY_TRIANGLE raycast mode. 2013-10-16 18:03:39 +03:00
Yao Wei Tjong 姚伟忠
9dff5a029c Remove redundant reference to 'UIElement' style. 
'UIElement' is a valid element type but not element style. 'UIElement' style is not yet defined so far.
 2013-10-16 14:42:55 +08:00
Yao Wei Tjong
759203d11c Merge pull request #19 from friesencr/profiler_text_shadow 
Add shadow to Debug HUD text for readability.
 2013-10-15 22:42:08 -07:00
Chris Friesen
0454fcab95 add shadow to debug ui text 2013-10-15 23:05:08 -05:00
Yao Wei Tjong 姚伟忠
cfe7ccf21c Replaced the logic to use VARIANT variable instead. 
The CMAKE_CROSSCOMPILING variable cannot be used here because it will be always false since 'buildvm-*' is only built natively (not cross-compiling).
 2013-10-16 00:44:57 +08:00
Yao Wei Tjong 姚伟忠
7a562a4e6c Fixed tolua++ 64-bit Mac Os X build when LuaJIT is enabled. 
The tolua++ executable segfaults when it is generated without proper linker flags.
 2013-10-16 00:17:32 +08:00
Yao Wei Tjong 姚伟忠
aed0da5161 Fixed FreeType debug build. 2013-10-15 22:56:49 +08:00
Lasse Öörni
840d50ce0d Allow to force FreeType autohinting (old 2.3 version behavior.) Reload font faces when global font settings changed. 2013-10-15 15:31:39 +03:00
Lasse Öörni
b32b521641 Restore one point larger size for the editor attributes font. 2013-10-15 00:32:58 +03:00
Lasse Öörni
7cfb9a85f7 Trust FreeType about the font's row height. Possibly improves issue #13. 2013-10-15 00:08:51 +03:00
Lasse Öörni
bc6dd70fae Update FreeType version in documentation, and FreeType's own documentation. Enabled FreeType subpixel hinting. Restored old BlueHighway.ttf. Removed FreeType .mk and jamfiles. 2013-10-14 23:15:52 +03:00
Lasse Öörni
efefbca976 Merge remote-tracking branch 'remotes/friesencr/bump_freetype' 2013-10-14 22:39:09 +03:00
Yao Wei Tjong 姚伟忠
5896e52552 Filter target architecture information if the tool is available. 
The initial target architecture detection for LuaJIT on Raspberry Pi native build was painfully slow due to the amount of output produced by compiler.
The filter reduces the number of output rows and speeds up the process significantly.
 2013-10-14 10:39:31 +08:00
Chris Friesen
12d22bd8cc update freetype 2013-10-13 16:18:28 -05:00
Lasse Öörni
6e3dde8a10 Merge branch 'font2' 2013-10-13 21:43:42 +03:00
Lasse Öörni
267523a738 Adapted Aster Jian's mutable glyph mechanism. Globally switchable on from the UI subsystem. Configurable font texture max size in UI subsystem. 2013-10-13 21:42:36 +03:00
Yao Wei Tjong 姚伟忠
405e89b5f2 Fixed LuaJIT native build on Raspberry Pi. 
Missed out one more condition check before applying -m32/64 flag.
 2013-10-14 00:22:32 +08:00
Lasse Öörni
b1b60edbf4 Code cleanup. 2013-10-13 17:28:05 +03:00