mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 09:10:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,964 Commits 99 Branches 46 Tags
4068ec747b01db762161ef3fc904b8643d96f401
Commit Graph

129 Commits

Author SHA1 Message Date
Matthew Territo
9a435ac74d Extended temporary fade functionality 
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max
 2016-07-27 19:25:49 -06:00
Alexander Bock
6d8a16f19e Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119) 
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120)
 - ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
 - The countdown timer is set in the openspace.cfg
 2016-07-17 02:33:45 +02:00
Alexander Bock
5502c52b9a Adapt Rosetta and New Horizons keybindings to restructuring of ProjectionComponent 2016-07-01 15:22:21 +02:00
Alexander Bock
5a5ffd76bb Add InteractionHandler to global property gui 
Add property to interactionhandler to enable/disable rotational and zoom friction
 2016-06-29 22:42:12 +02:00
Michael Nilsson
6573a6dfce add heroku baseurl and key bindings 2016-06-15 11:07:20 -04:00
Alexander Bock
fde537681f Some work on fixing 67P projections for all available times 2016-05-30 15:26:47 +02:00
Alexander Bock
d3ab18ec93 Clean keybindings of Rosetta scene 2016-05-30 13:54:33 +02:00
Alexander Bock
884324c467 Cleanup of default.scene and keybindings 2016-05-30 13:36:55 +02:00
Alexander Bock
52c5d3a406 Add common Lua functions for scene definitions 
Adapt New Horizons scene to use new common.lua file
 2016-05-30 13:25:31 +02:00
Alexander Bock
78c0ed902f Correct displacement factor for planetary heightmap 
Correctly bind F8 key for clearing rosetta projections
 2016-05-30 11:41:14 +02:00
Alexander Bock
7b525d1b29 Move keybindings for the newhorizons scene into its own file 2016-05-19 17:20:38 +02:00
Alexander Bock
dba650c80d Create separate key bindings for rosetta mission 
Prolong rosetta trail
 2016-05-18 21:37:27 +02:00
Alexander Bock
20532d704f Rename Lua functions to preInitialization and postInitialization 
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
 2016-04-30 14:18:08 +02:00
Alexander Bock
7b1670ea0b Remove startup warnings 2016-02-21 01:50:51 +01:00
Emil Axelsson
a6a9537b6c Merge with antialiased abuffer 2016-02-03 17:47:29 +01:00
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock
bae8d0aa76 Making OpenSpaceTest application compile with API change 
Set default start to July 2015
Move default window out of the corner
Compile fixes
 2016-01-14 16:05:29 +01:00
Alexander Bock
b6fe3a004a Fixed bind_keys script 2015-07-09 11:36:31 +02:00
Michal Marcinkowski
284989d48c Cleanup and refractoring of RenderableFov.cpp 
- Removed code causing memleaks
- Improved MVIC intersection when no cornerpoints intersect
- General readability and logical fixes (long overdue)
- Fix so arbitrary amount of fov-bound-vectors can be loaded
- Updated keybinds & data etc
 2015-07-08 00:14:01 -04:00
Michal Marcinkowski
e1dcfd4780 Adding / changing a few keybinds 2015-07-06 14:38:04 -04:00
Michal Marcinkowski
cafd89e9fa Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	scripts/default_startup.lua
 2015-06-29 16:40:09 -04:00
Michal Marcinkowski
d102a16a82 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
modules/newhorizons/rendering/renderableplanetprojection.cpp
	modules/newhorizons/util/hongkangparser.cpp
	modules/newhorizons/util/hongkangparser.h
	modules/newhorizons/util/imagesequencer2.cpp
	modules/newhorizons/util/labelparser.cpp
	modules/newhorizons/util/labelparser.h
 2015-06-29 16:39:09 -04:00
Anton Arbring
8fbd027a1e Adding convenient scripts for showing 67P and changing coordinate system to 67P 2015-06-25 20:28:36 -04:00
Michal Marcinkowski
e0ea622989 Adding hybrid read method for Pluto 
Cleanups + logical changes to parsing and sequencing
 2015-06-25 20:19:08 -04:00
Michal Marcinkowski
7492fa2f6c New Additions: 
Shadow cylinders extending from planet terminator in opposite dir of sun
Plane that displays the global texture map of a planet as projections appear
^latter is an addition to RenderablePlane class, a renderable plane can have
boolean keyword "ProjectionListener" - determines whether or not it displays
 2015-06-03 19:10:34 -04: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
cf4afc0159 Set default coordinate system to Jupiter to agree with the default time 2015-05-14 01:13:14 +02:00
Anton Arbring
7d513a5a1f Remove/change keybinds 2015-05-13 16:45:50 -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
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
Anton Arbring
1cebc07939 Modified projections, removed fading and some key binds 2015-05-11 18:39:35 -04: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
f8d6f42f44 Default startup + renderengine fixes 
Added interesting times for Dawn and Rosetta in default startup script.
Fixed coordinate system switch to Vesta, commented for demo but needed for
development.
 2015-05-04 19:52:56 -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
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
Michal Marcinkowski
de6fcf1583 completely new imagesequencer class - WIP 2015-04-16 11:57:23 -04: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
Alexander Bock
1a29ad6208 Merge branch 'develop' into plutoViz 2015-02-27 09:01:55 +01:00
Michal Marcinkowski
39e5f2aa28 Improvements to the ImageSequencer class. 
- Now _properly_ switches instruments at the moment set instrument is activated
 2015-02-26 15:50:37 -05:00
Alexander Bock
d4f8bba27f Fixed crash with changing coordinate systems 
Adapted startup script to new openspace-data
 2015-02-26 18:07:37 +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
4a5682b88f Disable fadeIn on default 2015-02-25 19:13:14 +01:00
Alexander Bock
d249e9422e Fixed bug where ScriptEngine would complain about double-added libraries 
Correct application of default keybinding
 2015-02-25 17:57:25 +01:00
Alexander Bock
e155e7ec9f Adding functionality to pause the simulation time 
Removed retreatTime function and replaced by a call to -advanceTime
 2015-02-25 17:50:34 +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