Alexander Bock
fdead75cfa
Remove move values from constants.h
...
Disable ghosting in ephemeris to remove dependency on imagesequencer
2015-05-20 17:42:47 +02:00
Alexander Bock
4de4c015d7
Starting to clean out constants.h file by moving constants into the relevant classes
2015-05-20 16:32:28 +02:00
Anton Arbring
481f247a23
Pre presentation mods
...
Modified REX animation
Modified printouts in renderengine
More key binds
Fixed renderablePlaneProjection bug
changed dark side of projected planets
2015-05-12 23:23:29 -04:00
Anton Arbring
2b8b8c0416
Solving merge conflicts with develop
2015-04-18 16:10:05 -04:00
Anton Arbring
6cc21b3be7
Added image plane projection + shaders and dynamic ephemeris.
...
The plane projection is now hard coded to target until it can be
returned from imagesequencer. The dynamic ephemeris is not used for
this at the moment but will come in handy later on.
2015-04-17 22:09:35 -04:00
Alexander Bock
0180130464
Fix multiple dependencies in SceneGraphNodes
2015-04-13 21:52:23 +02:00
Alexander Bock
bd382f9e8e
Cleanup of WaveFrontGeometry
2015-02-25 23:39:20 +01:00
Alexander Bock
df71f97943
Added configuration switch "DisableRenderingOnMaster" to disable rendering on the master node
2015-02-24 13:41:42 +01:00
Alexander Bock
a7bd6319db
Adding 'property' prefix to subowner methods in PropertyOwner
...
Added function for writing documentation of properties
2015-02-22 22:05:25 +01:00
Joakim Kilby
3d04af03a3
Merge branch 'develop' into plutoViz
...
Conflicts:
include/openspace/rendering/planets/simplespheregeometry.h
include/openspace/util/powerscaledsphere.h
openspace.cfg
shaders/pscstandard_fs.glsl
src/engine/openspaceengine.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scenegraph/scenegraph.cpp
2015-02-18 15:52:35 +01:00
Alexander Bock
a0fc77a893
Enable the ability to run setting scripts that are executed after the scene has been loaded
2015-02-17 20:10:50 +01:00
Alexander Bock
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
Alexander Bock
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
Michal Marcinkowski
44e02465a1
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/powerscaledsphere.h
src/rendering/renderablefov.cpp
src/rendering/renderablesphericalgrid.cpp
src/rendering/renderabletrail.cpp
src/util/powerscaledsphere.cpp
src/util/spicemanager.cpp
2015-01-22 10:31:40 -05:00
jonasstrandstedt
6b164f0b36
Added camera offset support
2015-01-06 12:43:16 +01:00
Michal Marcinkowski
bd841c488c
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/scenegraph/scenegraph.cpp
src/util/factorymanager.cpp
2014-12-08 21:26:38 -05:00
Alexander Bock
2c85d53164
Made GUI optional
2014-12-06 18:33:11 +01:00
Alexander Bock
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
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
michal
bd74acedd3
fixing stupid git mistake.
2014-11-28 17:15:13 -05:00
michal
a5c232eb88
Tidying up.
2014-11-28 14:41:59 -05:00
michal
845469b15d
Merge branch 'develop' into solarsystem2
...
Conflicts:
openspace.cfg
shaders/generated/constants.hglsl
src/engine/openspaceengine.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/spicemanager.cpp
2014-11-26 13:42:36 -05: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
michal
79b75aa572
field of view rendering. Intermediate commit.
...
Working on trying to get the fov-on-surface square to render.
2014-11-01 18:41:09 -04: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
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
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
1ed4b74d3e
added renderablepath and made changes to renderabletrail
2014-10-08 16:15:37 -04: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
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
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
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
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
Alexander Bock
dd629db53d
More code cleanup, force inclusion of swizzling for GLM
2014-09-19 17:44:33 +02:00
Alexander Bock
9b2a04a8c4
More work on Time class
...
Fixed bool -> int conversion in SpiceManager
2014-09-14 15:51:46 +02:00
