Commit Graph

375 Commits

Author SHA1 Message Date
Alexander Bock 98d6e7138a Second try to fix the camera 2014-10-08 10:30:50 +02:00
Alexander Bock fdd0efccfc Fix OpenSpaceTest 2014-10-07 22:27:06 +02:00
Alexander Bock 4bbe60637d Finished cleanup of SpiceManager 2014-10-07 21:45:24 +02:00
Alexander Bock 5763c54a49 Added error reporting function to SpiceManager
Started cleaning up codebase
2014-10-07 02:22:19 +02:00
Alexander Bock 62e0844671 Add ABuffer/constants.hglsl to the ignore list 2014-10-06 13:44:21 +02:00
Alexander Bock 32c2c499fa Fix SpiceManager test 2014-10-06 01:43:33 +02:00
Alexander Bock f7af8256dd Finished cleaning the SpiceManager 2014-10-06 01:33:56 +02:00
Alexander Bock b7da50b3dd Added Lua method to print a screenshot 2014-10-05 17:31:47 +02:00
jonasstrandstedt 795d02b9aa Fixed delete of unallocated memory 2014-10-03 21:21:21 +02:00
Jonas Strandstedt 3cad506b5b PowerScaling modifications
- Started working on PowerScaling with some initial changes
- Faking the stars by blending with the abuffer
- Changed texture filtering for planets, looks better in my opinion
2014-10-03 17:02:31 +02:00
Jonas Strandstedt e4a8e87098 Using new ghoul ProgramObject functionality
- Fixed risk of memory leak in SceneGraph (deleting shaders)
2014-10-01 15:30:39 +02:00
Jonas Strandstedt cc3f9ef34b Fixed ABuffer to update shader when Scengraph is updated 2014-09-29 13:03:58 +02:00
Alexander Bock e97d5f17bc More SpiceManager cleanup 2014-09-28 16:13:26 +02:00
Alexander Bock 83e7398fee GCC fixes, fixed unit tests 2014-09-28 03:03:24 +02:00
Alexander Bock e6ab0f51fc Started cleanup of SpiceManager 2014-09-28 02:28:14 +02:00
Alexander Bock b667a4910c Reworked how SPICE kernels are loaded
- SpiceEphemeris can provide a list of kernels that are loaded when created
- Time and Leapsecond kernels are provided in the openspace.cfg file
2014-09-28 00:06:53 +02:00
Alexander Bock e0d100c13a GCC compile fix 2014-09-27 22:00:25 +02:00
Alexander Bock 1b3823d88c Remove old Spice wrapper 2014-09-27 21:46:24 +02:00
Alexander Bock 3a2c4e92fc Remove the paths from the configuration dictionary to make it unnecessary to keep them synchronized with the filesystem 2014-09-27 19:42:25 +02:00
Alexander Bock f3fb8cd95e Apply getValueSafe/getValue change of Dictionary to the codebase 2014-09-27 19:23:24 +02:00
Alexander Bock cfcf0247be More cleanup of ConfigurationManager 2014-09-27 19:13:36 +02:00
Alexander Bock add7e06a64 Cleaning up ConfigurationManager 2014-09-27 18:54:10 +02:00
Alexander Bock dd15c4e3d0 Make the subcomponents not pointers in the first place 2014-09-27 18:41:03 +02:00
Alexander Bock 72aac7b240 Refactoring OpenSpaceEngine pointers into unique_ptr
Compile fix for GCC
2014-09-27 18:15:03 +02:00
Alexander Bock 0570bffb68 Cleanup of OpenSpaceEngine by factoring out ConfigurationManager class 2014-09-27 18:04:43 +02:00
Alexander Bock b343f4e552 GCC compile fixes 2014-09-27 15:33:16 +02:00
Alexander Bock 4d756daaf6 Simplified error handling in Lua API 2014-09-27 15:25:35 +02:00
Alexander Bock 1ca2bfd6c9 Remove more warnings 2014-09-26 18:19:28 +02:00
Alexander Bock 41895d5a63 Updated to new ghoul version 2014-09-26 18:05:26 +02:00
Alexander Bock bedc894064 Removing Jenkins warnings 2014-09-26 17:53:18 +02:00
Jonas Strandstedt 742b1016d4 Added logmanager in openspacengine.h 2014-09-26 17:33:39 +02:00
Jonas Strandstedt 5427dbdeb2 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefieldlines.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/stars/renderablestars.cpp
2014-09-26 17:17:18 +02:00
Jonas Strandstedt 2d359fd48c Started working on modularizing PSC and ABuffer 2014-09-26 17:03:59 +02:00
Alexander Bock 4cea480882 Added Lua function to access absolute Paths 2014-09-26 14:35:04 +02:00
Alexander Bock 7359adf400 Replaced RuntimeData with separate, temporary structs that are passed around 2014-09-26 13:29:01 +02:00
Alexander Bock b3e800acaa Comment out flare code 2014-09-26 13:24:09 +02:00
Alexander Bock d7190b2239 Allow Lua scripts to reload scenegraph file 2014-09-26 01:02:13 +02:00
Alexander Bock bc36cdca03 Comment malfunctioning encoding/decoding code from RenderEngine 2014-09-26 01:01:36 +02:00
Alexander Bock 11ecb32801 Fix crash when PropertyOwner's are deallocated 2014-09-26 01:01:00 +02:00
Alexander Bock dbd13b3310 Replace hard-coded constant with constant definition 2014-09-26 01:00:15 +02:00
Alexander Bock edd52e60b7 Make the KameleonWrapper replace the lines on Windows as well 2014-09-25 23:41:02 +02:00
Alexander Bock e6576e88d6 Retrieve modules path from scene file instead openspace.cfg 2014-09-25 23:40:33 +02:00
Alexander Bock 1d9a3b7b00 Allow the scenegraph to be empty 2014-09-25 22:20:18 +02:00
Alexander Bock 5951d0f50d Try fixing Jenkins compile errors 2014-09-25 19:01:43 +02:00
Jonas Strandstedt c526c0f38d Added volume for debug purpose. Temporary fixed fast time. 2014-09-25 17:17:11 +02:00
Jonas Strandstedt 8042111ffe Merge branch 'develop' into spicesolarsystem
Conflicts:
	include/openspace/rendering/renderable.h
	include/openspace/rendering/renderablevolumecl.h
	include/openspace/rendering/renderablevolumeexpert.h
	include/openspace/rendering/renderablevolumegl.h
	include/openspace/rendering/renderengine.h
	include/openspace/scenegraph/ephemeris.h
	include/openspace/scenegraph/scenegraph.h
	include/openspace/scenegraph/spiceephemeris.h
	include/openspace/scenegraph/staticephemeris.h
	include/openspace/util/constants.h
	include/openspace/util/time.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablevolumecl.cpp
	src/rendering/renderablevolumeexpert.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/spiceephemeris.cpp
	src/scenegraph/staticephemeris.cpp
	src/util/factorymanager.cpp
	src/util/spicemanager.cpp
	src/util/time.cpp
2014-09-25 13:54:42 +02:00
Jonas Strandstedt 82ff7fa984 Merge branch 'develop' into stars
Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp
2014-09-24 15:39:22 +02:00
Jonas Strandstedt 326599c538 Small fix for missing Boost 2014-09-24 13:46:04 +02:00
jonasstrandstedt 43610798f6 Made it easier to get started on Windows 2014-09-23 13:39:39 +02:00
michal 700f590a2a SPICE-time dependency, retrieval of spice ephemerides and rotational matrix + coordinate references.
Added functionality:
- New class renderablesphericalgrid is repurposed code from powerscaledsphere class.
  Due to z-buffer issues used as reference grid to confirm planetary orbits are correct.
  This has been a major problem as prior we had no visual reference.
  Now we have a Galactic-, Celestial- and Ecliptic-coordinate grid.
  To this also added separate shader: grid_vs.glsl / grid_fs.glsl
  These grids have a static-rotational matrix derived from partiview (thanks to Brian)
  since spice req. to-from frame to compute rotational matrix.

Time dependency:
- Added struct RuntimeData - which for now only contains openspace time and is passed to all renderables
- All renderables accept runtimeData, keep private reference and use for computation of rotational matrix
- This obviously carries corresponding changes to Scenegraph and ScenegraphNode.

Spicemanager:
- Added function that more easily provides access to rotational matrix used in spice
 (used in renderableplanet for computing planetary objects spin around axis)

Ephemeris-classes:
- Now compute ephemeris from spice based on timeepoch in runtimedata
  TODO: once z-buffer fixed - set ephemeris correctly as meters (not kilometers)

Renderengine:
- Advances time with the advanceTime method in RuntimeData struct

ISSUES:
- Our Y axis NOT same as SPICE or star-catalogue, all renderables rotated now 90deg, needs redefinition,
  lots of debugging and major headaches before this conclusion.
- Depth buffer needs to be fixed in order to properly place planets.
- Spice kernels have finite time-range, when time stops - simulation ends - ugly fix: reset time to zero.
  Possible fix: kernels de431 (part 1-2) cover huge timespan and most likely have functions to extrapolate time,
  drawback is that they are 1,7 gb each.

TODO:
- Compute and draw dynamic ephemeries for each renderable. Either do full year sweep then update for each point or
  create a tail of linesegments for each planet. Dont know yet how to do this, would like spicephemeris to be
  sub-class of Renderable (have own render() method) - good/bad?
2014-09-19 20:32:33 -04:00