Commit Graph

556 Commits

Author SHA1 Message Date
Michal Marcinkowski
7492fa2f6c New Additions:
Shadow cylinders extending from planet terminator in opposite dir of sun
Plane that displays the global texture map of a planet as projections appear
^latter is an addition to RenderablePlane class, a renderable plane can have
boolean keyword "ProjectionListener" - determines whether or not it displays
2015-06-03 19:10:34 -04: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
fc3faab5f1 Replace commandline argument with automatically detecting the supported OpenGL version 2015-05-28 20:33:22 +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
77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock
4dddafcec9 Fixing more memory leaks 2015-05-26 21:44:49 +02:00
Alexander Bock
fd0501d61c Defined default constructor for RenderData 2015-05-24 14:30:18 +02:00
Alexander Bock
98024ca29d Remove warnings 2015-05-24 00:09:52 +02:00
Alexander Bock
f1e6ad6f3d Remove more warnings 2015-05-23 22:42:51 +02:00
Alexander Bock
433d0ba3a6 Fixing CMake for Mac OS 2015-05-23 19:50:03 +02:00
Alexander Bock
f2a7ea9630 Fixing compile warning 2015-05-23 01:39:23 +02:00
Alexander Bock
fc4a6b68fb Remove static version.h and replace by autogenerated file 2015-05-22 11:33:45 +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
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
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
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
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
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
a96a34575c Fix initial message queueing by introducing a sleeping timer 2015-05-13 00:17:46 +02: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
70e50706c8 Merge branch 'develop' into trailmods 2015-05-11 15:28:31 -04: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
b93aa9c80d Set OpenSpace version string to prerelease-5
Only handle status messages in timeline application if playbooks are received
2015-05-07 23:40:31 +02:00
Alexander Bock
1177e4e4cf Restructure parsers, send label parser information to GUI application 2015-05-07 18:26:23 +02:00
Alexander Bock
b2fcbe4fb0 Adding final keyword 2015-05-07 17:30:36 +02:00
Alexander Bock
b536c5c32f Merge branch 'develop' into feature/parser 2015-05-07 17:27:28 +02:00
Michal Marcinkowski
e0fedb203d Merge branch 'develop' into NewHorizonsMerge 2015-05-05 20:33:52 -04:00
Michal Marcinkowski
665d832454 optimization for projections 2015-05-05 20:19:19 -04:00