mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-05 03:00:21 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,701 Commits 83 Branches 46 Tags
6ebfb92a8d1fad8ffe6bc597878e19db3e8f2e51
Commit Graph

1276 Commits

Author SHA1 Message Date
=
6ebfb92a8d Work on asset loading 2017-10-12 19:00:51 +02:00
=
6f3cc8f6a5 Work on asset loading 2017-10-11 17:06:51 +02:00
Emil Axelsson
c0b9e1d1a7 Clean up code 2017-10-10 16:43:12 +02:00
Emil Axelsson
b6bee846a2 Work on data management 2017-09-21 16:29:21 +02:00
Emil Axelsson
f4901fa4cf Work on asset management 2017-09-18 18:13:20 +02:00
Emil Axelsson
8a30251fcb Work on asset management 2017-09-18 12:56:55 +02:00
Emil Axelsson
aaed6ab6d7 Work on asset loader and assets 2017-09-15 14:05:43 +02:00
Emil Axelsson
bf45937619 Compile fix in asset and assetloader 2017-09-15 11:13:46 +02:00
Emil Axelsson
af8bec1441 Prepare for data sync 2017-09-14 20:16:51 +02:00
Emil Axelsson
4cdae984e9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-09-11 11:52:31 +02:00
Alexander Bock
c3825cc81e Only display commit hash text overlay if there is information available 
Add version and commit information into a global property
 2017-08-31 11:37:22 -04:00
Alexander Bock
0ceab49df7 Update gitignore to include Mars texture 
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395)
 2017-08-30 14:56:02 -04:00
Emil Axelsson
5ebd4d5327 Add missing file 2017-08-15 12:03:25 +02:00
Emil Axelsson
2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl
 2017-08-15 11:43:18 +02:00
Emil Axelsson
6c36fa7bfd Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	include/openspace/util/concurrentjobmanager.h
	include/openspace/util/concurrentjobmanager.inl
	include/openspace/util/concurrentqueue.h
	include/openspace/util/concurrentqueue.inl
	include/openspace/util/threadpool.h
	modules/globebrowsing/tile/tileloadjob.h
	modules/sync/syncmodule.cpp
	src/util/threadpool.cpp
 2017-08-15 11:34:54 +02:00
Alexander Bock
a016fd96a6 Fix duplicate property name error 2017-08-14 15:24:41 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381) 
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
 2017-08-14 09:38:32 -04:00
Emil Axelsson
cb7319d5f2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
 2017-08-14 11:17:25 +02:00
Alexander Bock
8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
Alexander Bock
c04b379520 Enable the selection of constellation bounds through the mod file 2017-07-29 01:57:16 -04:00
Alexander Bock
ad5ca816a9 Move friction properties into common subowner 2017-07-29 01:33:22 -04:00
Alexander Bock
31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Alexander Bock
5ca44d4aa1 Allow RenderableGlobe to have a single radius 
Make GlobeBrowsing scene the new default scene
 2017-07-27 17:24:22 -04:00
Alexander Bock
35a41d3283 Remove Exhaustive parameter for documentation 2017-07-27 14:46:46 -04:00
Alexander Bock
19f8e30813 Change RenderableModel "Rotation.ModelTransform" to "ModelTransform" 
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
 2017-07-27 00:22:17 -04:00
Alexander Bock
142f807586 Jenkins compile fix 2017-07-26 19:20:57 -04:00
Alexander Bock
14b4f5c1f0 Jenkins compile fix 2017-07-26 18:15:40 -04:00
Alexander Bock
0b30a9e244 Jenkins compile fix for Linux 2017-07-26 17:58:12 -04:00
Alexander Bock
59bccd040d Cleanup changes 2017-07-26 17:29:57 -04:00
Alexander Bock
dc79a94142 Remove warnings 
Update SGCT repository
Update Ghoul repository
 2017-07-26 11:59:48 -04:00
Alexander Bock
1a475ef570 Started documenting properties 
Cleanup of Nagivationhandler properties
 2017-07-24 00:15:45 -04:00
Alexander Bock
2e6465d888 Correctly order the Property::Visibility enum 2017-07-22 23:09:38 -04:00
Alexander Bock
04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock
b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Alexander Bock
e661324002 Remove style guide errors 
Add missing newline errors
 2017-07-21 11:52:25 -04:00
Emil Axelsson
faa67d9a96 Merge branch 'feature/core-threadpool' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-07-21 11:35:34 +02:00
Emil Axelsson
1160831b66 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/core-threadpool 2017-07-21 11:25:42 +02:00
Emil Axelsson
92c85bbd34 Move GlobeBrowsing thread pool to OpenSpace core 2017-07-21 11:25:30 +02:00
Emil Axelsson
84a52c091a Work on assets 2017-07-20 17:06:34 +02:00
Alexander Bock
008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Emil Axelsson
5ced910f79 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp
 2017-07-18 10:54:41 +02:00
Alexander Bock
0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Alexander Bock
7cfa358f04 Convert std::bad_any_cast back to ghoul::bad_any_cast 2017-07-17 16:25:27 -04:00
Alexander Bock
40926aa68f Remove <any> include 2017-07-17 16:19:26 -04:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits 
Update Ghoul
 2017-07-17 15:54:00 -04:00
Alexander Bock
90e0364c5a Revert to using ghoul::any due to lack of support on macOS 2017-07-17 13:46:35 -04:00
Alexander Bock
4dba552fd1 Started switching OpenSpace projects to nested namespaces 
Various cleanups
 2017-07-15 20:01:55 -04:00
Alexander Bock
3b1c2b37a0 Update ghoul repository 
Adapt to the change from ghoul::any to std::any
 2017-07-15 18:13:52 -04:00
Alexander Bock
713b5bb97b Fix compile error in iSWA module 
Update warning specification for modules
Disable unreferenced local function warning
Update Ghoul
 2017-07-15 17:48:03 -04:00
Alexander Bock
6f524f4a67 Add centralized escaping of JSON strings 
Enable correct escaping of " character thus removing the need to outlaw "s in comments
 2017-07-14 16:58:18 -04:00