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 姚伟忠
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