mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 09:41:13 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,040 Commits 99 Branches 46 Tags
0cdceddeeec8a84b9356ec0d280eddff46c27017
Commit Graph

399 Commits

Author SHA1 Message Date
Alexander Bock
dcc9d6228d Some minor cleanup 2017-03-05 20:08:24 -05:00
Emil Axelsson
d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume 
Conflicts:
	src/engine/openspaceengine.cpp
 2017-03-03 18:08:29 +01:00
Emil Axelsson
b32c416615 Improvements from code review 2017-03-03 17:39:23 +01:00
Alexander Bock
c12bd7182b Some cleanup of ModuleEngine 
Some cleanup of SettingsEngine
Some cleanup of SyncEngine
 2017-03-02 17:24:44 -05:00
Alexander Bock
d6b5bb753b - Some cleanup of LuaConsole 
- Moved dedicated Lua commands into a visible property
  - Disallow non-ASCII characters
- Remove unused KeyboardController
- Remove unused DeviceIdentifier
- Some cleanup of LogFactory
  - Move and use documentation into the class
 2017-03-02 14:27:18 -05:00
Emil Axelsson
0377737843 Adapt to new interfaces 2017-03-02 18:53:05 +01:00
Emil Axelsson
442969f2b1 Jenkins compilation fix 2017-03-02 18:50:11 +01:00
Emil Axelsson
cb7e81cf3d Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner. 
Conflicts:
	modules/volume/CMakeLists.txt
	modules/volume/linearlrucache.h
	src/engine/openspaceengine.cpp
 2017-03-02 18:20:01 +01:00
Alexander Bock
3274882ec2 Add checks for inline files in style checker 2017-03-01 21:17:12 -05:00
Alexander Bock
fbea8389c8 - Add check in style guide that prevents ‘using namespace’ in header files 
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
 2017-03-01 21:02:33 -05:00
Alexander Bock
8fd60ce8e6 - Remove documentation.h include and replace with forward declaration 
- Move Documentation struct into documentation namespace
 2017-03-01 18:13:15 -05:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock
11fbff5fbc Reduce the dependency of libOpenSpace on modules 
- Enable module callbacks for OpenSpaceEngine
 - Add OpenSpaceModule function that returns a Lua library
 2017-02-16 16:43:34 -05:00
Alexander Bock
8456087cf5 Add a style check that checks whether the correct GLM header is used 
Adapted files to use the correct GLM headers
 2017-02-14 13:12:59 -05:00
Alexander Bock
23ea86949f Updated check_style_guide to test for include guards and copyright 
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
 2017-02-09 23:55:39 -05:00
Alexander Bock
6d9dc2bfeb Fixed include guards 
Removed unused writeToTexture file
 2017-02-09 19:12:21 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017 
Update Ghoul repository
Remove libgdal link
 2017-02-06 18:02:01 -05:00
Alexander Bock
aa2ac511ff Adapt to Ghoul changes of moving LogLevel out of LogManager 2016-12-14 22:59:22 +01:00
Alexander Bock
d139dd2d22 Clean include guards in OpenSpace core 
Remove unused files
 2016-12-09 13:54:22 +01:00
Alexander Bock
04c6398d6a Fix case dependent kernels in OsirisRex 
Fix stitched trail rendering for RenderableTrailTrajectory
Adapt Lua scheduler helper scripts to new Dictionary layout
Make Spice throw exceptions on default again
Enable caching on default for CTX and MOLA data
Add NOAA rt data (commented out in LodEarth)
 2016-12-06 18:47:46 +01:00
Alexander Bock
341bc8b105 Merge branch 'develop' into feature/globebrowsing 
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
 2016-12-03 01:32:23 +01:00
Alexander Bock
c515bbfd0f Redesign the ScriptScheduler to not copy scripts on return 
Fix earth.mod file
 2016-12-03 00:51:32 +01:00
Alexander Bock
af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +01:00
Alexander Bock
c199d38aac Add setting to SpiceManager that disables exceptions (closing #142) 
Disable exceptions on default
 2016-11-24 10:57:53 +01:00
kalbl
a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Alexander Bock
683fc8ee53 Pr/trails (#170) 
* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
 2016-11-23 10:35:46 +01:00
kalbl
d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
Alexander Bock
c880ee421a Make OpenSpaceModule able to report their version number 2016-10-29 23:13:37 +02:00
Alexander Bock
4597bde05a Cleaned up RenderableRings 
Some minor performance improvements
 2016-10-29 22:15:17 +02:00
Erik Broberg
05687abb65 Add documentation to GPU structs and small refactor 2016-10-28 12:13:25 +02:00
Erik Broberg
1df163a3b9 Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working 2016-10-21 13:49:44 +02:00
Erik Broberg
2af1731583 Simple mapping of structs on CPU to GPU. See gpuChunkTilePile 2016-10-20 10:17:40 +02:00
Erik Broberg
979bf1f992 Add class GPUTexture 2016-10-19 11:30:31 +02:00
Erik Broberg
0476c32994 Add templated class GPUData 2016-10-18 19:05:40 +02:00
Emil Axelsson
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop 
Conflicts:
	src/interaction/interactionhandler.cpp
 2016-09-30 11:01:37 +02:00
Alexander Bock
cc9a72a60b Clean up and add documentation to Mission 
Clean up and add documentation to MissionManager
Clean up and add documentation to TimeRange

Prevent a crash in DocumentationEngine when ReferencingVerifier could not be found
 2016-09-25 14:25:01 +02:00
Emil Axelsson
8efdddde39 avoid oversampling in time sync 2016-09-23 00:27:06 +02:00
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection 
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
 2016-09-22 19:33:05 +02:00
Emil Axelsson
112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Erik Broberg
7f393a3270 Inject SyncBuffer into SyncEngine. Add Doxygen comments for SyncEngine and SyncData 2016-09-16 20:32:29 -04:00
Erik Broberg
dd304fee31 Make ScriptEngine implement Syncable interface 2016-09-16 15:40:29 -04:00
Erik Broberg
0cd40512dd Generalize Syncable interface and use mutex locks for SyncData 2016-09-16 12:21:19 -04:00
Alexander Bock
a25a9b4a2d Add the ability to the FactoryManager to write documentation about all registered classes 
Enable this feature on default in openspace.cfg
Move all generated documentations into a documentation folder
Adapt gitignore accordingly
 2016-09-16 17:37:02 +02:00
Erik Broberg
ee0cc6d165 Remove explicit syncing in Time and Camera and let SyncEngine do the work 2016-09-15 17:03:46 -04:00
Erik Broberg
6024070745 Add new classes SyncEngine and SyncData to encapsulate SGCT synchronization 2016-09-15 17:02:00 -04:00
Alexander Bock
a354f13ef3 Adding DocumentationEngine 2016-09-15 13:48:28 +02:00
Alexander Bock
dbc9b7ae4e Move documentation to their own folder 2016-09-14 14:44:51 +02:00
Alexander Bock
a4fa9c0788 Add Range checks to unit tests 2016-09-14 09:27:34 +02:00