e0ea622989
Adding hybrid read method for Pluto
...
Cleanups + logical changes to parsing and sequencing
2015-06-25 20:19:08 -04:00
df1da946cf
Merge remote-tracking branch 'origin/feature/abuffer' into feature/downloadmanager
...
Conflicts:
include/openspace/abuffer/abufferframebuffer.h
src/abuffer/abuffer.cpp
2015-06-22 13:43:57 +02:00
7401b7d48b
Enable FrameBuffer-based rendering on Windows
2015-06-18 15:42:41 +02:00
3fee6e8baf
Added more logging text to detect errors
2015-06-10 19:03:06 +02:00
8de6d9db05
Moving global blackout factor into RenderEngine
...
Cleanup of Abuffer implementations
2015-06-05 14:25:35 +02:00
16e09e5802
Remove static code analysis warnings
2015-06-04 01:44:31 +02:00
8ad7702b75
Automatically detect which rendering method to use based on the available OpenGL version
2015-06-03 13:31:42 +02:00
37a54ab22b
Move specification of RenderingMethod into renderengine
2015-05-28 20:44:12 +02:00
9d733eb613
Moving Kameleon into its own module
...
Moving fieldline rendering into its own module
2015-05-26 23:51:15 +02:00
98024ca29d
Remove warnings
2015-05-24 00:09:52 +02:00
ef58668b81
Making OpenSpace compile and run when the NewHorizons module is not loaded
2015-05-23 20:47:06 +02:00
e51df4b2a0
Sorting more classes into the correct modules
2015-05-20 21:40:52 +02:00
523abd6529
Modularized the base classes
2015-05-20 19:19:10 +02:00
fdead75cfa
Remove move values from constants.h
...
Disable ghosting in ephemeris to remove dependency on imagesequencer
2015-05-20 17:42:47 +02:00
4de4c015d7
Starting to clean out constants.h file by moving constants into the relevant classes
2015-05-20 16:32:28 +02:00
2bb2b906ff
Outsource Lua functions into their own inline files
2015-05-20 12:46:29 +02:00
154a949e8b
Cleaning up more shaders
2015-05-20 11:28:51 +02:00
b8cd01ea4e
Removing ghosting from renderablemodel
...
Organizing shaders
2015-05-20 11:18:14 +02:00
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
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
9e02d35d8a
Fix spelling errors in method names
2015-05-19 01:13:53 +02:00
8860a1cd1f
Remove vao, vbo and ibo property declarations from simplespheregeometryprojection class
2015-05-19 01:09:57 +02:00
dc665639d5
Fixed crash with ABufferFixed implementation
2015-05-19 01:05:19 +02:00
02dbe8c2b3
Renamed abufferSingleLinked files to abuffersinglelinked for capitalization conformance
2015-05-19 00:53:11 +02:00
abdd1af2a9
Cleaning up abuffer classes
...
Make ABuffer type selectable in openspace.cfg
2015-05-19 00:47:47 +02:00
36b921a017
More cleanup of RenderEngine
2015-05-18 18:34:48 +02:00
1ce07f205e
Cleaning up RenderEngine
2015-05-18 17:57:53 +02:00
6a9fdef2e0
Fixes for Mac rendering of stars and milkyway
2015-05-14 12:50:17 +02:00
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
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
1369e5caf5
adding capability to clear images on the fly
...
- (rest will be done on antons machine)
2015-05-13 15:19:41 -04:00
597ed14014
Fixing CREDITS file
...
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
28abe46bcf
Fixing various issues that appeared in Mac
...
Fixing flat qualifier in shader
Fix default values
Disable postFX shader
2015-05-13 16:52:25 +02:00
41c1293cc4
Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx
2015-05-13 14:25:08 +02:00
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
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
072b9d7bef
Fix a crash that appeared with strcpy -> strcpy_s change
2015-05-12 22:22:31 +02:00
b5aa86873a
Fix many warnings
2015-05-12 13:05:35 +02:00
cf857fc0f2
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 18:41:25 -04:00
1cebc07939
Modified projections, removed fading and some key binds
2015-05-11 18:39:35 -04:00
c345774a0d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 23:30:12 +02:00
5027b32f9d
Add RenderableCrawlingLine for REX instrument on New Horizons
2015-05-11 23:29:27 +02:00
28f84eaab1
Removed printout..
2015-05-11 16:12:14 -04:00
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
9c16f088c1
Fixing errors that occured in OS X
...
Fixing a default success argument
Fixed \r line ending handling
Removed discarding a fragment in planetprojection
2015-05-08 19:26:29 +02:00
d508998b45
Merge branch 'develop' into feature/osx
...
Conflicts:
ext/ghoul
2015-05-08 16:28:35 +02:00
e0fedb203d
Merge branch 'develop' into NewHorizonsMerge
2015-05-05 20:33:52 -04:00
665d832454
optimization for projections
2015-05-05 20:19:19 -04:00
b458e6c0f9
Yet another linux fix
2015-05-05 17:12:24 +02:00
335571879d
Fixing bug in linux with va_arg macros
2015-05-05 15:56:10 +02:00
Michal Marcinkowski