mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,234 Commits 83 Branches 46 Tags
8de6d9db05d085fa44adbc0b1a7dda7dc3b35fcd
Commit Graph

197 Commits

Author SHA1 Message Date
Alexander Bock
8de6d9db05 Moving global blackout factor into RenderEngine 
Cleanup of Abuffer implementations
 2015-06-05 14:25:35 +02:00
Alexander Bock
16e09e5802 Remove static code analysis warnings 2015-06-04 01:44:31 +02:00
Alexander Bock
8ad7702b75 Automatically detect which rendering method to use based on the available OpenGL version 2015-06-03 13:31:42 +02:00
Alexander Bock
37a54ab22b Move specification of RenderingMethod into renderengine 2015-05-28 20:44:12 +02:00
Alexander Bock
9d733eb613 Moving Kameleon into its own module 
Moving fieldline rendering into its own module
 2015-05-26 23:51:15 +02:00
Alexander Bock
98024ca29d Remove warnings 2015-05-24 00:09:52 +02:00
Alexander Bock
ef58668b81 Making OpenSpace compile and run when the NewHorizons module is not loaded 2015-05-23 20:47:06 +02:00
Alexander Bock
e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock
523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock
2bb2b906ff Outsource Lua functions into their own inline files 2015-05-20 12:46:29 +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
02dbe8c2b3 Renamed abufferSingleLinked files to abuffersinglelinked for capitalization conformance 2015-05-19 00:53:11 +02:00
Alexander Bock
abdd1af2a9 Cleaning up abuffer classes 
Make ABuffer type selectable in openspace.cfg
 2015-05-19 00:47:47 +02:00
Alexander Bock
36b921a017 More cleanup of RenderEngine 2015-05-18 18:34:48 +02:00
Alexander Bock
1ce07f205e Cleaning up RenderEngine 2015-05-18 17:57:53 +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
Alexander Bock
597ed14014 Fixing CREDITS file 
Removing many of clang warnings
 2015-05-13 19:33:34 +02:00
Alexander Bock
41c1293cc4 Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx 2015-05-13 14:25:08 +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
072b9d7bef Fix a crash that appeared with strcpy -> strcpy_s change 2015-05-12 22:22:31 +02:00
Alexander Bock
b5aa86873a Fix many warnings 2015-05-12 13:05:35 +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
Alexander Bock
d508998b45 Merge branch 'develop' into feature/osx 
Conflicts:
	ext/ghoul
 2015-05-08 16:28:35 +02:00
Alexander Bock
b458e6c0f9 Yet another linux fix 2015-05-05 17:12:24 +02:00
Alexander Bock
335571879d Fixing bug in linux with va_arg macros 2015-05-05 15:56:10 +02:00
Alexander Bock
b79acb1501 Fixing variable names to fix linux compile error 2015-05-05 15:45:00 +02:00
Alexander Bock
5b1ab8b692 Fix crash when changing coordinate system origin to Pluto 2015-05-05 14:10:37 +02:00
Alexander Bock
0c655e98f2 Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui 
Conflicts:
	src/rendering/renderengine.cpp
	src/util/imagesequencer2.cpp
 2015-05-05 11:42:49 +02: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
Alexander Bock
9a76f37573 Fix crashes with focus node change when view and camera vectors were almost the same but not equal 
Fix crash when moving to time without any images
 2015-05-03 00:14:01 +02:00
Alexander Bock
df5daa3021 Fixing blend functions for Framebuffer-based rendering 2015-04-28 22:10:56 +02:00
Alexander Bock
11b0e98ec6 More changes to enable rendering on OS X 2015-04-28 19:32:21 +02: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
59ab268489 restore back some previous code 2015-04-23 00:13:11 -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
5cf614f03d Modified changeViewPoint in order to work with new parenting system 2015-04-21 20:37:24 -04:00
Anton Arbring
f95b746ee1 Made position depend on parent 2015-04-20 11:34:19 -04:00
Alexander Bock
a974fd62e1 Trigger a post-receive hook 2015-04-17 14:25:39 +02:00
Alexander Bock
8f603f3d09 More linux fixes 2015-04-17 14:22:15 +02: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