mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 13:12:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
979 Commits 84 Branches 46 Tags
07a26fa1e95d2664b9a9ebcc80eab705d5211d6d
Commit Graph

54 Commits

Author SHA1 Message Date
Alexander Bock
07a26fa1e9 Setting the current working directory to the actual module directory for each module 2015-03-03 14:28:30 +01:00
Alexander Bock
f63fb32379 Addressing more CppCheck warnings 2015-02-23 19:22:45 +01:00
Alexander Bock
5eb5a9a479 Enable the possibility to switch between coordinate systems (with the Sun in the center vs Pluto in the center) 2015-02-19 19:13:55 +01:00
Michal Marcinkowski
971381b150 fov lines, check. 2015-02-18 19:41:56 -05: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
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Alexander Bock
862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00
Alexander Bock
69e0213e79 Added ability to disable shading for RenderablePlanet renderables 2015-02-16 19:23:23 +01:00
Michal Marcinkowski
4c53f763f0 Recentering at Pluto, 
Todo - add NH with kernels.
 2015-01-23 12:10:21 -05: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
Alexander Bock
7181a8f9da Remove test code 2014-12-17 18:19:06 +01:00
Jonas Strandstedt
b81133e381 Removes most of Visual Studio warnings 2014-12-16 19:09:32 +01:00
Alexander Bock
734ce03d72 Changed the deinitialization of renderable from the destructorto the scenegraphnode 2014-12-15 20:51:00 +01:00
Michal Marcinkowski
f032b4e3b0 Merge branch 'develop' into solarsystem2 
Conflicts:
	.gitignore
	include/openspace/rendering/renderablefov.h
	src/CMakeLists.txt
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/factorymanager.cpp
 2014-12-15 13:23:30 -05:00
jonasstrandstedt
7b2b81ed54 Fix memory leaks and proper deinitialization 2014-12-11 10:13:10 +01:00
jonasstrandstedt
01361307f6 Update ghoul reference 
- Added destructor to OpenSpaceEngine to deallocate SyncBuffer
- Changed texture reading to avoid memory leak
 2014-12-10 20:57:41 +01:00
jonasstrandstedt
81caf96d72 Started working on Renderables 
- Making sure isReady is properly set
- Making sure initialization is done correctly
- Making sure deinitialization is done correctly
 2014-12-10 19:43:38 +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
d3e16a0437 Apply changes to texture reading 2014-12-05 21:01:54 +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
Alexander Bock
4de8071efe Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails 
Fix velocity in RenderableStars
 2014-11-28 01:41:26 +01: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
michal
d6d7f1ffe7 intermediate commit. 2014-11-12 12:28:16 -05:00
Jonas Strandstedt
f85e18dc18 OS X now doesn't crash for volumes 
- Fixed a few warnings
 2014-11-05 17:11:27 +01:00
michal
ecfc4ad79a reshaping the modelloader class to suit the overall design of openspace 2014-10-23 18:49:15 -04:00
michal
21745b91a5 new class - renderabletrail - will later be renamed and current replace renderableephemeris. 
Right now just adding a bunch of mod files, i know this is rather ugly but i just need it to work for friday.
 2014-10-07 18:44:14 -04:00
michal
96853d579b added changes to make things work on my end 2014-10-06 18:48:47 -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
acc8056455 added some new classes for ephemeris rendering.. 2014-10-06 15:30:13 -04:00
Alexander Bock
f7af8256dd Finished cleaning the SpiceManager 2014-10-06 01:33:56 +02:00
michal
d2c13eb104 adding objloader 2014-10-03 18:57:01 -04: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
Alexander Bock
f3fb8cd95e Apply getValueSafe/getValue change of Dictionary to the codebase 2014-09-27 19:23:24 +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
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
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
51be4b1788 Make use of new Dictionary::getValueSafe method 
Clean up code in various places
 2014-09-19 00:29:36 +02:00
Alexander Bock
5add1682d3 More work on properties 
Added notify method to templateproperty's set method
Fixed names of subpropertyowners
 2014-08-31 16:08:19 +02:00
michal
b1851e5313 Added geometry shader for halos and separate shader for points. Parsecs->m conversion works and added test-data to datafolder. 2014-08-28 23:04:27 -04:00
michal
013d4c5bb6 WIP: intermediary commit, will attempt to run HC's code on this machine. 2014-08-25 17:37:23 -04:00
Alexander Bock
3520bd121e Renamed pss to PowerScaledScalar 2014-05-11 18:34:57 +02:00
Alexander Bock
9bc084bf81 More PowerscaledCoordinate cleanup 2014-05-11 15:59:48 +02:00
Alexander Bock
89142340d0 PowerscaledCoordinate cleanup 2014-05-11 15:01:55 +02:00
Alexander Bock
6cfdd130bc Code cleanup of PowerScaledSphere 2014-05-06 18:19:53 +02:00