Karl Bladin
ff74f0794c
Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-04-04 12:12:19 -04:00
Erik Broberg
9d45463e93
Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate
2016-03-30 19:34:42 -04:00
Emil Axelsson
80fe89dbc8
change interfaces from pointer to reference
2016-03-23 14:00:40 +01:00
Emil Axelsson
ebe10a29b5
Volume rendering compatible with abuffer and framebuffer renderers
2016-03-21 16:40:24 +01:00
Emil Axelsson
73cf15beb6
- Add currentDrawBufferResolution method in WindowWrapper
...
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
eight samples
2016-02-09 10:46:51 +01:00
Alexander Bock
d0f4ab6f60
Removing Jenkins warnings
2016-02-05 23:28:45 +01:00
Alexander Bock
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +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
c92fc923f9
Remove constants.h file
...
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
Alexander Bock
293faf8ca9
Adopted cleaned up fontrendering code
2015-11-23 20:18:38 -05:00
Alexander Bock
4f7ab5321f
Cleanup RenderEngine to completely rely on Ghoul font rendering
2015-11-17 17:31:43 -05:00
Alexander Bock
2cf7dfb27d
Changed RenderEngine to use Ghoul fontrendering instead of SGCT
2015-11-16 19:21:05 -05:00
Alexander Bock
bbb622f555
Initial work on integrating fontrendering into ghoul
2015-11-02 21:40:45 -05:00
Alexander Bock
062817b7fb
More work moving code to window wrapper
...
Removing capability to show SGCT rendering information
2015-10-26 11:20:48 -05:00
Alexander Bock
7401b7d48b
Enable FrameBuffer-based rendering on Windows
2015-06-18 15:42:41 +02:00
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
