mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 12:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
340 Commits 99 Branches 46 Tags
b3e800acaa4eace6c56d391bd92b799cd13e471d
Commit Graph

150 Commits

Author SHA1 Message Date
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
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
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
bd850d56f5 Remove renderableToggle as it has been replaced with a property 2014-09-18 20:39:30 +02:00
Alexander Bock
0fbdbb8dab Fix a bug in TemplateProperty preventing new bool values to be set 
Add "isEnabled" flag BoolProperty to all renderables
 2014-09-18 08:46:46 +02:00
Alexander Bock
8ec9bc6705 Cleaned up main.cpp 
Added functionality to send Lua scripts over the network
 2014-09-17 01:10:52 +02:00
Alexander Bock
a81547f40e Merge branch 'develop' into feature/time 2014-09-15 00:16:33 +02:00
Alexander Bock
50494cffdd More compile fixes for Jenkins 2014-09-14 23:49:38 +02:00
Alexander Bock
b30de7726e More compile fixes for Jenkins 2014-09-14 23:46:02 +02:00
Alexander Bock
1f7f4016ae More compile fixes for Jenkins 2014-09-14 23:40:48 +02:00
Alexander Bock
d8c41c7d4f Remove warnings and errors in Jenkin's gcc 2014-09-14 23:35:14 +02:00
Alexander Bock
66722e83a6 Cleaned up script functionality in SceneGraph 
Removed scriptfunctions.h and cpp as the functions have moved into other classes
 2014-09-14 18:36:33 +02:00
Alexander Bock
3d62caae46 Added missing documentation 2014-09-14 17:40:19 +02:00
Alexander Bock
f0dfd0fa04 Added documentation for Time class 2014-09-14 17:36:10 +02:00
Alexander Bock
9b2a04a8c4 More work on Time class 
Fixed bool -> int conversion in SpiceManager
 2014-09-14 15:51:46 +02:00
Alexander Bock
3afa0ecaa1 Added support for scripting 2014-09-13 18:25:14 +02:00
Alexander Bock
b6246f6538 Renamed methods in SpiceManager 
Started change of Time class
 2014-09-13 18:02:39 +02:00
Alexander Bock
ce10dea96e Fixed compile errors, probably finished merge 2014-09-13 11:45:49 +02:00
Alexander Bock
954dbdce13 Merge branch 'origin/feature/ABuffer' into properties 2014-09-13 10:59:33 +02:00
Alexander Bock
d659c11365 Make StringProperty a specialization rather than a subclass of TemplateProperty 2014-09-12 16:59:29 +02:00
Alexander Bock
cdfde82522 Added documentation for the PropertyDelegate class 2014-09-07 17:45:53 +02:00
Alexander Bock
e5b61492e9 Fixed documentation in the inlined code of TemplateProperty as well 2014-09-07 17:20:04 +02:00
Alexander Bock
351c235312 Added documentation to TemplateProperty 
Fixed bug where listeners were not notified
 2014-09-07 17:11:12 +02:00
Alexander Bock
fb24f06e5a Added doxygen files and fixed documentation errors 2014-09-07 16:59:51 +02:00
Alexander Bock
659b4ff3b8 Added documentation to PropertyOwner 2014-09-07 15:54:17 +02:00
Alexander Bock
eb7d1aac06 Added documentation to Property class 
Modified callback function mechanism to only allow one call back function to be present
 2014-09-07 15:02:35 +02:00
Alexander Bock
cd29bbee70 Added more conversion tests 2014-09-03 13:14:25 +02:00
Alexander Bock
dcfcc00092 Fixed to-Lua and from-Lua functions for all properties 
Corrected serialization of Vectorproperties into tables
 2014-09-03 00:18:57 +02:00
Alexander Bock
bbf707db1c Implemented first Lua serialization tests 
Fixed to-Lua and from-Lua functions for MatrixProperties
 2014-09-02 23:58:06 +02:00
Alexander Bock
bc7dbf4678 Merge branch 'develop' into properties 2014-09-02 21:24:42 +02:00
Alexander Bock
5c664798cb Adapted OpenSpace header in favor of Ghoul header in test cases 2014-09-02 21:24:32 +02:00
Alexander Bock
9436f5efb0 Merge branch 'develop' into properties 2014-09-02 21:20:40 +02:00
Alexander Bock
ac80776a28 Cleanup test code; removed warnings mostly and reenabled scenegraph test 2014-09-02 21:20:10 +02:00
Alexander Bock
be3f727706 Apply to-Lua and from-Lua functionality to TemplateProperty as well 2014-09-02 20:59:29 +02:00
Alexander Bock
e7697a4ce0 Enable setting and getting property values from Lua scripts 2014-08-31 17:52:02 +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
7bd44efc8e code optimization, cleanup. 2014-08-30 21:33:30 -04:00
michal
7e078352d0 Fixes to shader pipeline. 
- Added second shader for points only
- VBO interleaved array passed to both shaders
- passthrough in geom. shader works
- reading of additional scalar data from speck files.

TODO: calibrate scale and apparent brightnesses
 2014-08-30 16:40:44 -04:00
Alexander Bock
9671921331 More work towards a unified interface for accessing properties 2014-08-30 10:01:11 +02:00
Alexander Bock
79174d5b6c Cleaned up scripts directory 
Made scripts runnable at startup
Added printing functions and remapped default Lua printing
 2014-08-29 13:04:20 +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
8f3bcdeb54 WIP3: problems with texture coordinates, needs fix. 2014-08-26 19:26:09 -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
1782857c72 Bugfix accessing properties 2014-08-21 18:52:47 +02:00