Commit Graph

106 Commits

Author SHA1 Message Date
Alexander Bock
d9fbf7c5fd Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager 2014-12-05 16:43:54 +01:00
Alexander Bock
f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +01:00
Alexander Bock
0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +01:00
Alexander Bock
b05c4cf30f Add capabilities to write out documentation of all Lua functions on startup 2014-11-29 14:03:49 +01:00
Alexander Bock
fc1dcfabc8 Some more changes to the RenderableStars class 2014-11-26 16:36:02 +01:00
Alexander Bock
b4f6070642 Started cleanup of RenderableStars class 2014-11-25 19:15:59 +01:00
Alexander Bock
e630f6efbb Fixed bug that did not set cache directory correctly
Moved visibility of console into LuaConsole class
2014-11-18 17:47:09 +01:00
Alexander Bock
f02234099f Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file 2014-11-18 17:17:56 +01:00
Alexander Bock
a0503ba957 Modularizing font specification 2014-11-18 16:21:52 +01:00
Jonas Strandstedt
46959b4801 Cleanup for KameleonWrapper
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
2014-11-11 13:43:38 +01:00
Jonas Strandstedt
7e1396a8ae Added separete ProgressBar class 2014-11-07 14:48:03 +01:00
Jonas Strandstedt
3a2754fac7 Added support for more volume types
TODO:
- Test new type of volumes
2014-11-06 16:03:08 +01:00
Jonas Strandstedt
4bb9d8c800 Merge branch 'solarsystem2' into cleanup
Conflicts:
	src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt
ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
michal
ecfc4ad79a reshaping the modelloader class to suit the overall design of openspace 2014-10-23 18:49:15 -04:00
michal
08a97d9e68 Merge branch 'develop' into solarsystem2
Conflicts:
	scripts/default_startup.lua
	src/rendering/renderablewavefrontobject.cpp
2014-10-23 11:45:24 -04:00
Jonas Strandstedt
5e410c6816 Removed unused files 2014-10-23 14:35:04 +02:00
Jonas Strandstedt
a7da4d84cc Added SyncBuffer class
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00
michal
54809c6376 Pluto geometry artefacts commit. 2014-10-20 18:29:55 -04:00
Jonas Strandstedt
18a87ef99e Added ScreenLog
- Added first version of a ScreenLog mechanism
- Moved the info box to the upper left corner
- Added Ubuntu fonts
- Made RenderEngine a PropertyOwner with _showInfo and _showScreenLog as
  bool properties that can be edited through Lua.
2014-10-17 12:20:23 +02:00
Jonas Strandstedt
572651dba7 Added cotire to speed up compilation 2014-10-16 15:38:59 +02:00
Alexander Bock
c226e9b82f Cleaned up code
Added new COMMON_FOLDER setting in scene file
Error handling when spice kernels are not available
2014-10-11 13:40:52 +02:00
michal
3bb9912356 latest changes involve adding an unfinished class called "renderable fov"- ignore that one.
The rest is pretty straight forward, renderable trail is the ephemeris class and wavefrontobject is a very crudely constructed reader... ill fix that on monday
2014-10-11 01:43:31 -04:00
michal
d3f66c4a7c Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2
Conflicts:
	src/util/spicemanager.cpp
2014-10-08 16:27:51 -04:00
michal
1ed4b74d3e added renderablepath and made changes to renderabletrail 2014-10-08 16:15:37 -04:00
Jonas Strandstedt
eca6863450 Merge branch 'feature/camera' into solarsystem2 2014-10-08 14:36:48 +02:00
Jonas Strandstedt
5fcf9f0c6e Merge branch 'develop' into solarsystem2
Conflicts:
	src/util/spicemanager.cpp
2014-10-08 14:36:28 +02:00
Alexander Bock
98d6e7138a Second try to fix the camera 2014-10-08 10:30:50 +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
67f0fb3c08 Merge branch 'develop' into solarsystem2
Conflicts:
	.gitignore
	include/openspace/util/spicemanager.h
	shaders/star_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
2014-10-06 22:22:30 +02:00
Alexander Bock
f7af8256dd Finished cleaning the SpiceManager 2014-10-06 01:33:56 +02:00
michal
9eaf25f38c still working on obj loader, trying to maintain regular pushes to git. 2014-10-03 22:35:17 -04:00
michal
d2c13eb104 adding objloader 2014-10-03 18:57:01 -04:00
michal
938c442dd6 got renderable ephemeris working for larger deltas, problems with leap years though 2014-10-02 11:00:43 -04: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
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
1b3823d88c Remove old Spice wrapper 2014-09-27 21:46:24 +02:00
Alexander Bock
cfcf0247be More cleanup of ConfigurationManager 2014-09-27 19:13:36 +02:00
Alexander Bock
0570bffb68 Cleanup of OpenSpaceEngine by factoring out ConfigurationManager class 2014-09-27 18:04:43 +02:00
Alexander Bock
bedc894064 Removing Jenkins warnings 2014-09-26 17:53:18 +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
dbd13b3310 Replace hard-coded constant with constant definition 2014-09-26 01:00:15 +02:00
Alexander Bock
e6576e88d6 Retrieve modules path from scene file instead openspace.cfg 2014-09-25 23:40:33 +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
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