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
abc8f7a5d8
Make OpenSpace use new Cache version
2015-05-20 03:07:09 +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
683ce14449
Various cleanups in main.cpp
...
Adapted to new Ghoul version
2015-05-19 13:58:00 +02: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
79673d5f53
Do not log OpenGL version if the default version is used
2015-05-18 19:26:09 +02:00
6fdd172428
Fix initialization order of image sequencer to remove an error of unknown token
2015-05-18 19:18:35 +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
fe9b3172c6
Committing the depth hack for renderablemodel
...
Adding GL_STENCIL_BIT for Mac as it seems to help with an NSOpenGL error
2015-05-17 12:07:08 +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
9366fd4b80
More clang fixes
2015-05-13 19:48:41 +02: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
94c1e6e23c
Only create a handle message event with the correct size (in preparation for binary external controls)
2015-05-13 00:52:52 +02:00
a96a34575c
Fix initial message queueing by introducing a sleeping timer
2015-05-13 00:17:46 +02:00
b5846cc69b
Initiate thread sleeping after each initial message to not spam clients
2015-05-12 22:41:53 +02:00
072b9d7bef
Fix a crash that appeared with strcpy -> strcpy_s change
2015-05-12 22:22:31 +02:00
aa7830fed5
Added error when Label projection directory does not exist
2015-05-12 13:50:13 +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
70e50706c8
Merge branch 'develop' into trailmods
2015-05-11 15:28:31 -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
1177e4e4cf
Restructure parsers, send label parser information to GUI application
2015-05-07 18:26:23 +02:00
dac1f213b5
Fix instrumenttimes in labelparser
2015-05-07 17:42:37 +02:00
b536c5c32f
Merge branch 'develop' into feature/parser
2015-05-07 17:27:28 +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
e1c87a49ed
Redesign parser
2015-05-05 21:43:46 +02:00
02eaf6e7b9
Replaced asserts with ghoul_asserts
2015-05-05 17:57:18 +02:00
23a3950215
Fixing issue with linux
2015-05-05 17:46:51 +02:00
b35edde94a
Fixing issue with linux
2015-05-05 17:40:01 +02:00
dfca315293
Fixing issue with linux
2015-05-05 17:29:12 +02:00
Alexander Bock