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
bedc894064
Removing Jenkins warnings
2014-09-26 17:53:18 +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
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
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
bd850d56f5
Remove renderableToggle as it has been replaced with a property
2014-09-18 20:39:30 +02:00
Alexander Bock
80b73f9910
Fix for rendering volumes
2014-09-18 17:28:50 +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
3f1e8d67ca
Added more faster interaction
2014-09-17 20:11:59 +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
03e25f69d5
Update post-receive hook
2014-09-15 18:52:43 +02:00
Alexander Bock
8e1135cf27
Update post-receive hook
2014-09-15 18:32:22 +02:00
Alexander Bock
954b2d07e9
A change to check the build system
2014-09-15 18:31:27 +02:00
Alexander Bock
c7c7fa4413
Fix the build again
2014-09-15 18:02:57 +02:00
Alexander Bock
7f8b7950af
Deliberately break to check email from Jenkins
2014-09-15 17:59:06 +02:00
Alexander Bock
a81547f40e
Merge branch 'develop' into feature/time
2014-09-15 00:16:33 +02:00
Alexander Bock
3ae37d0991
More compile fixes for Jenkins
2014-09-14 23:53:41 +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
0eeeb8efd6
More work on fixing script access to time
2014-09-13 19:25:33 +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
1101b656b8
Added missing change for the merge
2014-09-13 12:10:55 +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
e13eafdbde
Added more comments to main.cpp
2014-09-13 10:33:16 +02:00
Alexander Bock
d659c11365
Make StringProperty a specialization rather than a subclass of TemplateProperty
2014-09-12 16:59:29 +02:00
michal
c1c637efa7
minor fixes, please ref to previous commit
2014-09-10 14:35:44 -04:00
michal
686c7b0b9b
final calibration + scaling fix. Looks good now.
2014-09-10 11:32:23 -04:00
