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

9886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
f299c0d815 Fixed Android GL context destroy / restore. Removed project.properties file, as it's generated by the command "android update project". 2013-10-27 14:58:41 +02:00
Yao Wei Tjong 姚伟忠
59d6d01125 Fixed 07_Billboards compilation issue. 2013-10-27 16:20:51 +08:00
Lasse Öörni
afa6c4ccc3 Initial SDL 2.0.1 merge. Windows tested OK. Android will crash when returning to the application. 2013-10-27 03:11:36 +03:00
Lasse Öörni
42ae752d2d Allow BillboardSet / ParticleEmitter to choose whether billboards should face the camera or follow the node orientation. Closes #22. 2013-10-26 23:42:08 +03:00
Lasse Öörni
1941eb991d Group Urho3D library source files in Visual Studio by subdirectory. 2013-10-26 19:50:02 +03:00
Lasse Öörni
b5fbb39cee Merge pull request #30 from szamq/master 
Fixed SetMaxVelocity in ParticleEmitter
 2013-10-26 08:41:16 -07:00
Paweł Mogiła
5752b58edc Fixed SetMaxVelocity in ParticleEmitter 2013-10-26 16:06:44 +02:00
Yao Wei Tjong 姚伟忠
c3242a3736 Refactor to shortcircuit if library is already found at parent scope. 
Note that there is actual no need to call the module again at child scope when it is already done at parent scope.
 2013-10-26 13:32:12 +08:00
Lasse Öörni
c43c8b523a Generated tangents to the models in Ogre source format. Normal mapping materials always require tangents in the model. Fixes #29. 2013-10-25 22:44:24 +03:00
Yao Wei Tjong 姚伟忠
0598ec9490 Improve robustness when FindUrho3D module is called multiple times. 
Ensure the change to CMake library suffix preferences is not being nullified because user calls the FindUrho3D module more than one time in different scopes.
 2013-10-26 01:38:31 +08:00
Yao Wei Tjong 姚伟忠
6846b179b4 Cleaned up comment. 2013-10-25 01:17:29 +08:00
Yao Wei Tjong 姚伟忠
589e0d53bb Change CMake library type preferences to agree with Urho3D. 
This change helps external CMake project to choose the correct library type as the compiler flags setup by the Urho3D-CMake-Magic module. Both the external project and the cmake module are being governed by the same URHO3D_LIB_TYPE build option.
 2013-10-25 01:01:53 +08:00
Yao Wei Tjong 姚伟忠
b85a0b3305 Suppress "unused variable" warning for external CMake project also. 2013-10-25 00:32:23 +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 姚伟忠
e34e26d068 Merge branch 'library-build'. 2013-10-23 15:15:03 +08:00
Lasse Öörni
18d4f6e6db Deploy Urho3D.dll to Bin directory after build. 2013-10-22 22:59:03 +03:00
Yao Wei Tjong 姚伟忠
a9ed330890 Create sub-projects for Samples/Tools/Extras. 2013-10-22 23:19:03 +08:00
Yao Wei Tjong 姚伟忠
db8f7a2289 Simplify the build script to eliminate unused variable. 
As the enable_pch() macro is not being called, there is no need to set SOURCE_FILES variable at this scope.
 2013-10-22 20:28:15 +08:00
Yao Wei Tjong 姚伟忠
7785640904 Fixed Lua/LuaJIT compilation issue. 
The combined Precompiled header does not include tolua++.h anymore, so it must be included back explicitly.
 2013-10-22 20:12:33 +08:00
Lasse Öörni
f39702a07e Terminology edits in the documentation. Do not refer to Graphics, Scene etc. as separate libraries anymore. 2013-10-22 00:58:58 +03:00
Lasse Öörni
0c14a17774 Use one combined precompiled header file for Urho3D library, as otherwise precompiled headers would be disabled on Visual Studio. 2013-10-22 00:48:27 +03:00
Lasse Öörni
89ea05f068 Fixed git revision generation on Win32 Android build. 2013-10-22 00:24:19 +03:00
Lasse Öörni
0eb45c0960 Fixed ShaderCompiler build. 2013-10-21 23:59:21 +03:00
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