mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,264 Commits 99 Branches 46 Tags
0a02906d8eaaee7589ae9628ee687098b0cbefbe
Commit Graph

247 Commits

Author SHA1 Message Date
Alexander Bock
37a54ab22b Move specification of RenderingMethod into renderengine 2015-05-28 20:44:12 +02:00
Alexander Bock
523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock
4de4c015d7 Starting to clean out constants.h file by moving constants into the relevant classes 2015-05-20 16:32:28 +02:00
Alexander Bock
b8cd01ea4e Removing ghosting from renderablemodel 
Organizing shaders
 2015-05-20 11:18:14 +02:00
Alexander Bock
18752b9d8b Remove individual dirty flags for ProgramObjects and replace with new Ghoul version 
Moved projectiveTexture shader into modules directory
 2015-05-20 10:33:36 +02:00
Anton Arbring
75c268db08 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/renderengine.cpp
 2015-05-19 12:00:02 -04:00
Alexander Bock
8860a1cd1f Remove vao, vbo and ibo property declarations from simplespheregeometryprojection class 2015-05-19 01:09:57 +02:00
Alexander Bock
dc665639d5 Fixed crash with ABufferFixed implementation 2015-05-19 01:05:19 +02:00
Alexander Bock
abdd1af2a9 Cleaning up abuffer classes 
Make ABuffer type selectable in openspace.cfg
 2015-05-19 00:47:47 +02:00
Anton Arbring
30dfc77d81 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderableplaneprojection.cpp
 2015-05-13 16:44:03 -04:00
Anton Arbring
a0042ef219 More last minute fixes 
Fixed plane bug (again)
changed rex animation (again)
More key binds
etc
 2015-05-13 16:15:50 -04:00
Michal Marcinkowski
1369e5caf5 adding capability to clear images on the fly 
- (rest will be done on antons machine)
 2015-05-13 15:19:41 -04:00
Alexander Bock
597ed14014 Fixing CREDITS file 
Removing many of clang warnings
 2015-05-13 19:33:34 +02:00
Anton Arbring
906bcf10a5 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderengine.cpp
 2015-05-12 23:29:14 -04:00
Anton Arbring
481f247a23 Pre presentation mods 
Modified REX animation
Modified printouts in renderengine
More key binds
Fixed renderablePlaneProjection bug
changed dark side of projected planets
 2015-05-12 23:23:29 -04:00
Alexander Bock
b5aa86873a Fix many warnings 2015-05-12 13:05:35 +02:00
Anton Arbring
cf857fc0f2 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-05-11 18:41:25 -04:00
Anton Arbring
1cebc07939 Modified projections, removed fading and some key binds 2015-05-11 18:39:35 -04:00
Alexander Bock
c345774a0d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-05-11 23:30:12 +02:00
Alexander Bock
5027b32f9d Add RenderableCrawlingLine for REX instrument on New Horizons 2015-05-11 23:29:27 +02:00
Anton Arbring
d6eaa0a81c Added renderablePath with timestamps 
Considered for using with 15 minute and hour timestamps
Added Shaders for the path
Included reparenting of the paths in renderengine
Modified start time for presentation
Changed model exaggeration to 1000 times original size
 2015-05-11 14:41:27 -04:00
Michal Marcinkowski
665d832454 optimization for projections 2015-05-05 20:19:19 -04:00
Michal Marcinkowski
f6d382f9f9 Merge branch 'NewHorizonsMerge' of openspace.itn.liu.se:/openspace into NewHorizonsMerge 
Conflicts:
	src/rendering/renderengine.cpp
 2015-05-04 20:27:52 -04:00
Michal Marcinkowski
0a1c0164ef Fixes to trails, fov and adding some keybindings 2015-05-04 20:15:34 -04:00
Anton Arbring
d495778d4a Restored some changes lost in merge + "timedots" 
Added impact on trails from start/stoptime definitions in modfile.
Added dots of equal time in trails, no progress on printing the time
string.
 2015-05-04 19:30:57 -04:00
Anton Arbring
d3bf8eb7f7 Merge branch 'timeadjustments' into NewHorizonsMerge 
Conflicts:
	CMakeLists.txt
	include/openspace/rendering/model/modelgeometry.h
	include/openspace/rendering/model/wavefrontgeometry.h
	include/openspace/rendering/planets/renderableplanetprojection.h
	include/openspace/util/imagesequencer.h
	scripts/default_startup.lua
	src/abuffer/abuffer.cpp
	src/rendering/model/renderablemodel.cpp
	src/rendering/model/wavefrontgeometry.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/spiceephemeris.cpp
	src/util/imagesequencer.cpp
 2015-04-23 22:51:55 -04:00
Michal Marcinkowski
8becbbde41 Imagesequencer update: 
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
 2015-04-22 21:53:28 -04:00
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
Michal Marcinkowski
de6fcf1583 completely new imagesequencer class - WIP 2015-04-16 11:57:23 -04: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
Michal Marcinkowski
d124209281 new imagesequencer class - WIP. 
Temporarily calling it "imagesequencer2"
 2015-04-09 12:36:05 -04:00
Michal Marcinkowski
cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04: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