mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-29 07:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,024 Commits 82 Branches 46 Tags
9226dd2d6bc3c69fefdc82246d70f80f5cd9cdb3
Commit Graph

217 Commits

Author SHA1 Message Date
Anton Arbring
bc591b2bdb Made night texture only be loaded if one exists, added new shader for planets with a night texture. 
Also added plane & image plane shader programs to the general shader declaration in scene.cpp
 2015-04-22 15:41:55 -04:00
Anton Arbring
97cbf977c5 Added body string to renderable to be able to search for target in scenegraph 2015-04-21 20:31:33 -04:00
Anton Arbring
f95b746ee1 Made position depend on parent 2015-04-20 11:34:19 -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
Anton Arbring
57800d12c7 added the possibility to load a city light/night texture for planets 2015-04-17 21:57:36 -04:00
Alexander Bock
c01bb7834b Merge branch 'develop' into feature/scenegraphloader 
Conflicts:
	src/abuffer/abuffer.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
 2015-04-17 13:31:39 +02:00
Alexander Bock
e7767bff11 More work on SceneGraph 
First working and sorted version
 2015-04-13 16:07:27 +02:00
Anton Arbring
914b3896ad SPICE error handling, position/rotation estimation etc... 
- When loading SPICE kernels, coverage for each body is stored.
- If the body does not have spk coverage a position is estimated.
- Added "pulsating" transparency levels for renderableModels with
  estimated position.
- Spice manager clean up, left a few unused methods but removed a lot of
  dead code.
- To support multiple missins being loaded, some errors are simply
  ignored in spicemanager, for better or worse.
- Added start time and stop time as dictionary keys for renderables.
- Made RenderableTrails only show the time between gaps.
- Added but out commented vesta coordinate system swich in renderengine.

NOTE: Renderables using spiceEphemeris will give errors if body keyword
is omitted in modfile (When checking SPK coverage in position update).
 2015-04-09 17:35:30 -04:00
Alexander Bock
79f3052887 More work on SceneGraphLoader 
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
 2015-04-09 21:43:13 +02:00
Anton Arbring
b79e6df763 Planets shape creation & fixed texture longitude 
Instead of spheres, the planets are now created as triaxial ellipsoids
according to the corresponding radii values in the SPICE kernels (if such
values are available). Apart from being more scientifically accurate, the
planets are shaped as the intersection functions in SPICE expects.

The textures will now also be aligned in longitude as in reality (w.r.t.
UTC) when using a texture map ranging from -180 in the left end to +180 on the
right, with 0 longitude in the middle (such as Greenwich in Earth texture)
 2015-03-20 19:59:26 -04:00
antar420
221db02af6 Refactoring modelgeometry and wavefrontgeometry 
To make modelgeometry more ready for extension in reading other file
formats in subclasses. Some minor fixes including an out of bounds error
for texture mapping with several shapes in the same file.
 2015-03-12 17:57:10 -04:00
antar420
4653d3d7c6 Minor fixes in renderablemodel 
Added _performShading as a property and modified a spicemanager call to be able
to work with models with different names for the rotation source frame and
ephemeris body (such as 67p).
 2015-03-10 12:22:52 -04:00
Alexander Bock
61d185e337 Fixing on-screen gui for multiple nodes 2015-02-27 14:07:11 +01:00
Alexander Bock
e6c1f34d48 Fixed a crash with RenderablePlane 
Fixed a crash with changing coordinate systems
 2015-02-26 13:25:13 +01:00
Alexander Bock
836f7a825b Making texture in RenderablePlane modular 
Disable rendering of the Sun by default in favor of the glare texture
 2015-02-26 13:10:43 +01:00
Alexander Bock
a4e4df3d28 More cleanup of WaveFrontGeometry and RenderableModel 2015-02-25 23:58:30 +01:00
Alexander Bock
bd382f9e8e Cleanup of WaveFrontGeometry 2015-02-25 23:39:20 +01:00
Alexander Bock
b3c4cc7a34 Make the line width of renderablefov changeable 2015-02-25 11:53:20 +01:00
Alexander Bock
5c72966346 Implemented caching for OBJ model files 2015-02-25 11:48:17 +01:00
Alexander Bock
862c8ffd96 Renamed globalOpacity to globalblackout 
Start application in blackout and fade in after scenegraph has been loaded
 2015-02-25 09:37:55 +01:00
Alexander Bock
3155073f05 More changes to allow JupiterProjection and PlutoProjection in the same scene 
Add a switch that allows Renderables to react to big changes in time (via openspace.time.setTime)
Allow the setting of the minimum pixel size of stars
 2015-02-24 19:16:15 +01:00
Alexander Bock
43a3716afd Intermediate result to change viewpoint from Jupiter projection to Plutoprojection 2015-02-24 17:52:40 +01:00
Alexander Bock
84f8ce961b Added configuration switch "DisableRenderingOnMaster" to disable rendering on the master node 2015-02-24 13:42:47 +01:00
Alexander Bock
35d664365e Adding Lua function to toggle the SGCT render information overlay 2015-02-24 10:45:50 +01:00
Michal Marcinkowski
85e13f7738 Added: 
New obj mod file with separate obj-loads
Imagesequencer - active instrument slightly improved
Printout of active instrument
Ortho-square dissapears when not needed
 2015-02-24 00:03:00 -05:00
Alexander Bock
7f6d894866 Fixed more gcc and Cppcheck warnings 2015-02-23 20:07:57 +01:00
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