Commit Graph

164 Commits

Author SHA1 Message Date
Alexander Bock 9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Emil Axelsson 752081d31b feature/time-refactor (#294)
- Change Time class to become a non-singleton
- Move ownership of the current time to TimeManager(instead of singleton access).
- Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables.
- Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped.
- Introduce Timeline and Keyframe classes
- Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager
- Added basic unit tests for Timelineand Keyframe

Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
2017-05-22 14:01:08 +02:00
Alexander Bock f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock 302fa06067 More code cleanup 2017-05-15 14:39:48 -04:00
Alexander Bock da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Emil Axelsson 28c82341bf Fix malformed mod files 2017-04-25 18:24:30 +02:00
Emil Axelsson 4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289)
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
2017-04-18 09:58:27 +02:00
Alexander Bock 51b420f2c4 Remove warnings
- Unit tests
  - core
  - onscreengui
  - debugging
  - newhorizons
Update Ghoul
2017-04-10 14:33:45 -04:00
Alexander Bock 78b0d77101 Start removing warnings 2017-04-06 20:07:01 -04:00
Emil Axelsson a108ee1f8a Fix requests from code review 2017-04-04 14:25:39 +02:00
Emil Axelsson b06864eefe Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-16 16:35:29 +01:00
Alexander Bock c6fbf6902a OSX compile fix 2017-03-14 11:16:43 -04:00
Alexander Bock 0d157ac165 Let FloatProperty and derived properties render at higher resolution in Onscreen GUI 2017-03-13 11:17:52 -04:00
Alexander Bock d61bb20992 Some more work on RenderableFov
Make registerting path tokens through Lua scripts work
2017-03-13 09:52:06 -04:00
Alexander Bock ea4d9c8e44 Cleanup of RenderableCrawlingLine
Cleanup of RenderableFOV
Add function to SpiceManager that does not return the light travel time
2017-03-12 16:05:14 -04:00
Alexander Bock dc40812df9 Fix warnings in code
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Emil Axelsson d92d001364 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-07 13:19:07 +01:00
Emil Axelsson 7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl
2017-03-07 10:57:50 +01:00
Alexander Bock 78ae311a1f Fix length of RenderableFov when target is not in field-of-view 2017-03-06 15:56:13 -05:00
Alexander Bock 9b92a4e9ca Reenable Hybridparser (closes #221) 2017-03-05 18:46:31 -05:00
Alexander Bock 34f1b55c3c Enable shifting the meridian of a RenderablePlanetProjection by 180 for Pluto 2017-03-05 17:26:22 -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 6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock a6c422c38e Fix runtime error with moving classes from base to space module
Add additional logging information to initialization
2017-02-08 14:42:28 -05:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Emil Axelsson 4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Alexander Bock dbb599a5fa Separate base module into base and space 2016-12-13 14:43:44 +01:00
Alexander Bock 8da0684ae2 More cleanup for newhorizons and globebrowsing module 2016-12-07 21:56:59 +01:00
Alexander Bock b3db661277 Fix RenderableFoV for all missions (NewHorizons, Rosetta, OsirisRex)
Make the CacheManager not crash when ShadowCylinder shader is created in the same cache directory as RenderablePlanet
Remove excessive logging from TileDataset
2016-12-07 14:51:31 +01:00
Alexander Bock c937203dc3 Cleanup New Horizons module 2016-12-06 18:48:07 +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 b00595af40 Replacing const std::string with const char* to reduce binary size and initialization costs 2016-11-23 23:52:16 +01:00
Alexander Bock e543163612 Updating Ghoul reference
Adapt to the API changes
2016-11-14 14:45:26 +01:00
Alexander Bock f99513a976 Remove the km to m conversion in RenderableFoV (closing #156) 2016-11-07 16:15:28 +01:00
Alexander Bock fd98f311d3 Some cleanup of scene files
Exceptions in preInitialization scripts no long crash the application
2016-10-31 11:43:36 +01:00
Alexander Bock 18b8aab898 Changes in ProjectionComponent initialization
- Remove parsing function
  - Make ProjectionComponent accept sub-dictionary
Remove "Rotation" key-value from RenderableModelProjection
  - Information moved into RenderableFOV to do conversion between object and frame
Changes in mod files to reflect ProjectionComponent and RenderableModelProjection changes
Added Documentation to
  - RenderablePlanetProjection
  - RenderableModelProjection
  - ProjectionComponent
  - PlanetGeometry
  - ModelGeometry
2016-10-27 21:45:49 +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
Alexander Bock 6637ae2849 Update Ghoul 2016-09-19 22:45:45 +02:00
Alexander Bock 9afae5c2f9 Remove extra includes 2016-09-15 09:19:46 +02:00
Alexander Bock 95b1a2a1ad Make the RenderableModelProjection shader work without a depth map 2016-09-07 17:21:08 +02:00
Alexander Bock 69f72718c0 Enable the change of projection texture size in ProjectionComponent (closing #105)
Make the Shadowmapping in RenderableModelProjection optional by setting a value in the mod file
2016-09-07 14:16:16 +02:00
Alexander Bock 3785d30ff6 Ability to enable and disable the ShadowMapping 2016-09-07 10:35:05 +02: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 6884eca40e Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta
Conflicts:
	modules/newhorizons/rendering/renderablemodelprojection.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	modules/newhorizons/util/projectioncomponent.cpp
2016-08-29 18:34:18 +02:00
Kalle Bladin 5551da922d Update renderables to higher precision rendering by calculating M and V matrix in double precision. 2016-08-24 16:16:31 -04:00
Kalle Bladin 22d60779c6 Update renderable planet projection to render in high precision 2016-08-24 11:42:44 -04:00
Kalle Bladin 6d9d2b5127 Update RenderableFov to inherit transform in model matrix 2016-08-19 21:12:12 -04:00
Kalle Bladin d042f6c4be Merge branch 'develop' into feature/osirisrex 2016-08-19 12:33:49 -04:00
Emil Axelsson 6d56b1d38a implement shadow mapping for image projections on non-convex bodies 2016-08-19 16:56:57 +02:00