Commit Graph

1162 Commits

Author SHA1 Message Date
Alexander Bock
8f0e1edcdd Reorganized CMakeLists file and included new Ghoul format 2015-05-22 01:17:15 +02:00
Alexander Bock
106cb45410 Started work on CMakeLists cleanup 2015-05-21 22:09:16 +02:00
Alexander Bock
ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00
Alexander Bock
e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock
59e474d5cd Modularize the newhorizons and volume classes 2015-05-20 21:08:21 +02:00
Alexander Bock
523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock
fdead75cfa Remove move values from constants.h
Disable ghosting in ephemeris to remove dependency on imagesequencer
2015-05-20 17:42:47 +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
2bb2b906ff Outsource Lua functions into their own inline files 2015-05-20 12:46:29 +02:00
Alexander Bock
154a949e8b Cleaning up more shaders 2015-05-20 11:28:51 +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
Alexander Bock
abc8f7a5d8 Make OpenSpace use new Cache version 2015-05-20 03:07:09 +02:00
Anton Arbring
db3a578e2e Updated submodule commit references 2015-05-19 12:22:04 -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
683ce14449 Various cleanups in main.cpp
Adapted to new Ghoul version
2015-05-19 13:58:00 +02:00
Alexander Bock
9e02d35d8a Fix spelling errors in method names 2015-05-19 01:13:53 +02: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
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
79673d5f53 Do not log OpenGL version if the default version is used 2015-05-18 19:26:09 +02:00
Alexander Bock
6fdd172428 Fix initialization order of image sequencer to remove an error of unknown token 2015-05-18 19:18:35 +02:00
Alexander Bock
15908e75a3 Undo sphere changes to make stars look proper again 2015-05-18 18:52:59 +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
Alexander Bock
66c06a411f Updated Lua version 2015-05-18 17:49:44 +02:00
Alexander Bock
25343d78c5 Updated Ghoul version 2015-05-18 16:51:42 +02:00
Alexander Bock
217753bf86 Reverting last changes as they do not work on Windows 2015-05-17 13:59:30 +02:00
Alexander Bock
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
Alexander Bock
6a9fdef2e0 Fixes for Mac rendering of stars and milkyway 2015-05-14 12:50:17 +02:00
Alexander Bock
8f5ba101e4 Remove stereo setting from single.xml
Create TimelineView in a bundle on Mac
2015-05-14 12:15:51 +02:00
Alexander Bock
cf4afc0159 Set default coordinate system to Jupiter to agree with the default time releases/v0.1.0 2015-05-14 01:13:14 +02:00
Anton Arbring
7d513a5a1f Remove/change keybinds 2015-05-13 16:45:50 -04: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
9366fd4b80 More clang fixes 2015-05-13 19:48:41 +02:00
Alexander Bock
597ed14014 Fixing CREDITS file
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Alexander Bock
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
Alexander Bock
41c1293cc4 Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx 2015-05-13 14:25:08 +02:00
Alexander Bock
42ed21b01d Fix the instruments' color coding in timeline application 2015-05-13 14:17:58 +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
886c1e3fae Prepare the timeline view for a switch to binary external controls 2015-05-13 00:53:41 +02:00
Alexander Bock
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
Alexander Bock
15578dc10a Improved handling of message data in TimelineView application 2015-05-13 00:21:06 +02:00
Alexander Bock
a96a34575c Fix initial message queueing by introducing a sleeping timer 2015-05-13 00:17:46 +02:00
Alexander Bock
b5846cc69b Initiate thread sleeping after each initial message to not spam clients 2015-05-12 22:41:53 +02:00
Alexander Bock
072b9d7bef Fix a crash that appeared with strcpy -> strcpy_s change 2015-05-12 22:22:31 +02:00