Erik Broberg
299cd27f2c
Fixed bug Camera (view rot matrix had translation components) and structured Camera code
2016-04-14 12:47:12 -04:00
Emil Axelsson
a44eed992f
Merge remote-tracking branch 'origin/feature/volumerendering' into develop
2016-03-21 18:55:32 +01:00
Emil Axelsson
ebe10a29b5
Volume rendering compatible with abuffer and framebuffer renderers
2016-03-21 16:40:24 +01:00
Alexander Bock
c3aa8fecc2
Update ghoul to account for removed boost dependency
2016-03-15 23:59:57 +01:00
Alexander Bock
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +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
cee66b9c5e
Fix image projection error that occurred due to degrees v radians glm functions
...
Don't crash if a shader recompile fails, but log an error
Use correct file extension for binary Spice kernels
2016-01-31 13:56:46 +01:00
Alexander Bock
c87fdfd38b
Fixes for Windows
...
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
Alexander Bock
177571195c
Completely remove references to constants.h
2015-12-14 17:36:15 -08:00
Alexander Bock
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
cd3a819541
Updating Ghoul version
...
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
Joakim Kilby
2188fc1809
Merge branch 'develop' into feature/remote
...
* develop: (72 commits)
Disable blackout on startup
Fixed path bug
Remove the rendering method override
Fix crash that happens when SpiceManager is deinitialized
Adding convenient scripts for showing 67P and changing coordinate system to 67P
Adding hybrid read method for Pluto Cleanups + logical changes to parsing and sequencing
Adding the possibility to project to arbitrary bodies model files
Adding support for imageplanes for multiple instruments
Fixing bug in model magnification
Made destination optional in data specifications
Renamed OpenSpaceModule's initialize method to create Created new initialize method that gets called in OpenSpaceEngine initialize
Remove setName function from OpenSpaceModule and move naming into constructor
Always build libtorrent as a static library
Set Launcher as default application Don't copy curl.dll on non-windows system
Correct CURL cmake specification
Add the FindCurl module from CMake into the support directory
Fix method renaming error in volume module
Updated data folder reference
Make SpiceManager derive from Singleton
Allow left-aligned and right-aligned messages in Launcher
...
Conflicts:
modules/kameleon/CMakeLists.txt
openspace.cfg
src/engine/openspaceengine.cpp
2015-07-01 14:38:33 +02:00
Joakim Kilby
2529d4c4d6
added definitions of which scripts should be shared over parallel connection
2015-06-26 09:37:51 +02:00
Alexander Bock
7401b7d48b
Enable FrameBuffer-based rendering on Windows
2015-06-18 15:42:41 +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
ef58668b81
Making OpenSpace compile and run when the NewHorizons module is not loaded
2015-05-23 20:47:06 +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
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
9366fd4b80
More clang fixes
2015-05-13 19:48:41 +02: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
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
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
Alexander Bock
607988f35e
Renamed functions to something more reasonable
2015-04-17 11:35:26 +02:00
Alexander Bock
e7767bff11
More work on SceneGraph
...
First working and sorted version
2015-04-13 16:07:27 +02:00
Alexander Bock
ccd58b7224
More restructuring work on SceneGraph
2015-04-12 14:50:43 +02:00
Alexander Bock
79f3052887
More work on SceneGraphLoader
...
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
2015-04-09 21:43:13 +02:00
