mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,636 Commits 99 Branches 46 Tags
2ed80426677730f1d64ebbfcd2aa57e220338283
Commit Graph

359 Commits

Author SHA1 Message Date
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
Alexander Bock
45d034ad2a Enabling optional arguments 
Adding tests to the OpenSpaceTest
 2016-09-13 20:27:29 +02:00
Alexander Bock
a71cccd58f Adding unit tests file 
Adding typedefs for all verifiers
 2016-09-13 19:58:58 +02:00
Alexander Bock
2e355c57e7 Add external template instantiation 2016-09-13 19:35:33 +02:00
Alexander Bock
faf180ab7d Writing more Unit tests 
Add InRangeVerifier and NotInRangeVerifier
Add static_asserts to prohibit nonsensical verifier combinations
 2016-09-13 19:29:00 +02:00
Erik Broberg
d287b08c51 Enable toggling use of doublebuffering for camera and time 2016-09-13 11:52:54 -04:00
Alexander Bock
9c7bd2af67 Restructuring documentation code 2016-09-13 16:27:42 +02:00
Alexander Bock
a3dde8da41 First working implementation of automatic documentation generation 2016-09-13 15:30:11 +02:00
Erik Broberg
5cb6d2cb05 Move camera and time serialization and deserialization to cpp-files 2016-09-12 14:05:26 -04:00
Erik Broberg
9c5deaba82 Use double buffering for time and camera syncing 2016-09-07 21:39:29 -04:00
Erik Broberg
60441c4fa1 Remove non-descriptive methods preSync and postSync from class Time 2016-09-03 21:06:09 -04:00
Erik Broberg
3a887fef02 Remove non-descriptive preSync and postSync methods from Camera class 2016-09-03 21:02:30 -04:00
Erik Broberg
796f80e511 Remove local, shared, synced Camera members, and keep one source of truth 2016-09-03 20:54:21 -04:00
Erik Broberg
9196ec2f50 Remove local, shared, synced versions of Time. Keep one source of true 2016-09-03 19:45:58 -04:00
Alexander Bock
ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta 
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
 2016-08-29 15:53:59 +02:00
Emil Axelsson
bc58623467 add render bins to improve rendering of transparent objects using framebuffer renderer 2016-08-25 18:26:59 +02:00
Erik Broberg
337cc64ab1 Add forgotten file 2016-08-22 15:35:27 -04:00
Kalle Bladin
628f8b479f Update updatestructures to have transform with translation, rotation and scale. 2016-08-18 16:59:51 -04:00
Kalle Bladin
ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -04:00
Erik Broberg
23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg
d4f635513d Merge branch 'develop' into feature/globebrowsing 2016-08-17 19:53:28 -04:00
Alexander Bock
c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files) 
Updating SGCT and Ghoul references
 2016-08-17 16:26:14 +02:00
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Kalle Bladin
542b9e11e6 Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation. 2016-08-17 00:19:25 -04:00
Kalle Bladin
bd867ec402 Update SceneGraphNode to contain rotation information and remove rotation definition from renderable model. 2016-08-12 12:28:56 -04:00
Erik Broberg
d6aa4216cc Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-02 19:25:39 -04:00
Kalle Bladin
4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock
6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties 
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
 2016-07-31 19:26:55 +02:00
Alexander Bock
635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02:00
Erik Broberg
b44e761eba Merge branch 'develop' into feature/globebrowsing 2016-07-21 13:29:33 -04:00
Alexander Bock
bc137ab377 Updated Spice library. Compile fix for Syncbuffer and Unittestson Linux 2016-07-20 10:41:06 +02:00
Kalle Bladin
541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock
1b7ede6d5c Add Lua functions to load and unload SpiceKernels 2016-07-18 14:41:27 +02:00
Alexander Bock
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock
94a46813fe Add to_string methods to Key, KeyModifier, and KeyWithModifier 2016-07-14 00:27:03 -04:00
Kalle
8fcaaf2799 Merge remote-tracking branch 'origin/develop' into feature/globebrowsing 2016-07-13 12:09:02 -04:00
Alexander Bock
e3a1b775fd Correctly rollback the previous rollback 2016-07-07 13:49:57 +02:00
Matthew Territo
da203364ba Rollback pointer changes to _synchronizationBuffer. 
Was causing segfault on mutex locks during launch.
 2016-07-06 12:02:01 -06:00
Alexander Bock
c9ac04d3cd Remove sgct inclusion from SyncBuffer header and move to the source file 
Fix serialization of MatrixProperty
 2016-07-06 17:52:16 +02:00
Kalle
dd7abd355a GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels 2016-07-01 17:42:49 -04:00