Alexander Bock
78ab23602f
Moved tinyobjloader from util into submodule of Ghoul
2015-02-23 18:08:28 +01:00
Alexander Bock
cc331a7496
Linux compile fix
2015-02-23 13:08:14 +01:00
Alexander Bock
34ff3c6018
More changes to RenderableStars using the AMNH test target
...
Removed superfluous properties of RenderableStars
Removed specialized settings file
2015-02-22 23:51:26 +01:00
Michal Marcinkowski
73baceadaa
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-22 13:11:03 -05:00
Michal Marcinkowski
cc65ce1167
changing obj loader to tinyobj
2015-02-22 13:10:47 -05:00
Joakim Kilby
ea2017e11c
Introduced fadeIn and fadeOut functionality via scripting.
2015-02-20 16:54:30 +01:00
Joakim Kilby
468bb98e46
created postFX functions in main and added a postFX pass to sgct engine to allow for a global fade after executing certain scripts.
...
added global opacity member variable with set/get methods in render engine.
added two VERY simple shaders used in the post FX pass. Note these are not handled in openspace so updating files does not update shader
2015-02-20 11:19:50 +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
d875e01e25
attempting to fix jenkins error
2015-02-19 11:51:14 -05:00
Alexander Bock
9bad48ae2e
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
2015-02-19 16:24:01 +01:00
Alexander Bock
f00158969c
Cleanup of ImageSequencer
...
Added caching to playbook loading
Increased performance of playbook loading
Added default placeholder image
2015-02-19 16:21:28 +01:00
Joakim Kilby
dce4835bab
changing render function of openspaceengine and renderengine to take glm::mat4 matrices for Projection / ViewMatrix.
2015-02-19 15:19:20 +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
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
d96dc3884c
Added properties to change the appearance of stars
2015-02-17 09:31:58 +01:00
Alexander Bock
f87fd42075
Merge remote-tracking branch 'origin/feature/milkyway' into develop
2015-02-17 09:22:43 +01:00
Joakim Kilby
1cfabe6a2d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
2015-02-17 08:25:09 +01:00
Alexander Bock
98aeeda24d
Added support for variable transparency in RenderableSphere
...
Created own shaders for RenderableSphere
2015-02-16 23:16:06 +01:00
Alexander Bock
bb5f6e1bca
Renamed member variable of SimpleSphereGeometry from _planet to _sphere
2015-02-16 22:13:03 +01:00
Alexander Bock
17f6d376be
Merge branch 'develop' into feature/milkyway
2015-02-16 21:03:36 +01:00
Alexander Bock
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
Joakim Kilby
a3ff828e91
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
...
Conflicts:
src/engine/openspaceengine.cpp
2015-02-16 08:33:01 +01:00
Alexander Bock
3c4aec0082
Modularize RenderablePlane shader
2015-02-15 23:55:13 +01:00
Alexander Bock
0de499b643
Jenkins compile fix
2015-02-13 10:15:58 +01:00
Joakim Kilby
e39f3adc18
Merge remote-tracking branch 'origin/develop' into feature/updateSGCT
2015-02-12 14:58:54 +01:00
Alexander Bock
a837b59add
First addition of RenderableSphere
2015-02-10 20:19:29 +01:00
Alexander Bock
31ec399faa
More changes on RenderableTrail
2015-02-10 20:18:20 +01:00
Alexander Bock
fd4d6562ad
First cleanup of RenderableTrails
2015-02-10 16:19:12 +01:00
Joakim Kilby
f43cc08dfb
added presync function for engine
2015-02-10 11:34:33 +01:00
Alexander Bock
bb8f7b91ec
Final changes on RenderableStars
2015-02-10 08:55:26 +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
Michal Marcinkowski
a8e5b61272
Image sequencing improvements and optimization of projection.
...
Projection now occurs only at specified timestamps.
Todo:
projection class now dependent on image sequences, will have
to change that once we read specific instrument schedule.
2015-01-21 11:28:38 -05:00
Alexander Bock
8ebd2e4d71
More code cleanup of RenderableFieldlines
2015-01-21 15:13:16 +01:00
Alexander Bock
d6a02140ea
More RenderableFieldlines code cleanup
2015-01-21 01:44:56 +01:00
Alexander Bock
f72d151c6c
Initial changes to RenderableFieldlines
2015-01-21 00:42:33 +01:00
Michal Marcinkowski
fa0f26c9da
In short, this is new:
...
- ImageSequencer class added, requires planetary data service files (not added to openspace-data, too large)
: Given current time returns path to specific image in dataset for projection.
- Changes to RenderablePlanetProjection class to accomodate sequencing
- Fixed normal computation in reverse-mapping stage
- Rudimental target recognition (will prob. become part of separate class at some point - since both fov & proj classes do similar things)
Next up:
- Redo pluto mockup visualization & begin spreadsheet reader for instrument-switching.
2015-01-16 13:06:52 -05:00
Michal Marcinkowski
812a9a48be
Normal computation in pre projection pass issue resolved.
2015-01-13 10:59:09 -05:00
Michal Marcinkowski
f37958c24f
beginning to work on sequencing
2015-01-10 16:07:05 -05:00
Michal Marcinkowski
ca39f5aaf5
begin cleanup, making code more transparent
2014-12-30 17:07:57 -05:00
Michal Marcinkowski
a6a34cf7dd
projection GPU first results, pre-cleanup commit.
...
TODO:
- fixes so it reads mission specific modfile keywords (ie targets)
- speedup using one more pass (vertex map generated every something-frame)
- sequencing (timestamp check + load of separate images on-the-fly)
- pass in geometric data of target + target-texture switching (later)
2014-12-26 13:42:34 -05:00
Michal Marcinkowski
ee306cf54c
Added separate shader for write to texture, relies on blend logic.
2014-12-22 10:02:31 -05:00
Michal Marcinkowski
b14ff04f76
wip - piping projection-to-texture to GPU.
2014-12-18 12:00:27 -05:00
Alexander Bock
5a7a518bad
Remove cppcheck warnings
2014-12-16 21:54:53 +01:00
Michal Marcinkowski
70569cba7f
fixes to restore to stage prior purge
2014-12-15 16:24:04 -05: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
Michal Marcinkowski
70d24185de
intermediate commit prior to merge
2014-12-12 11:52:31 -05:00
Jonas Strandstedt
93a34fa985
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-12-12 11:00:26 +01:00
