c746338553
added viewprojection matrix to screenspaceimage shaderprogram
2016-03-11 09:36:49 -05:00
fe2d90eb8f
solved conflict
2016-03-10 15:57:59 -05:00
9b3f2141a2
windows fix in screenspaceimage
2016-03-10 15:52:48 -05:00
540f7821b8
Compile fix
2016-03-10 15:08:43 -05:00
d27560957d
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
...
Conflicts:
modules/base/rendering/screenspaceimage.cpp
2016-03-10 15:06:34 -05:00
a53e289a20
Position, scale and texturepath properties
2016-03-10 15:04:44 -05:00
49eece4d43
change test image url to relative path in screenspaceimage
2016-03-10 14:44:15 -05:00
afc3883d4d
Flat screen property
2016-03-10 13:01:05 -05:00
07d6662957
ScreenSpaceRenderabled enabled propery in GUI
2016-03-10 11:19:22 -05:00
bdaf8dd956
Texture on screnspaceimage
2016-03-09 16:57:29 -05:00
dab046b302
Create ScrenSpaceImage at runtime for testing purposes
2016-03-09 10:45:53 -05:00
5a2833743d
add support for screenspacerenderables in renderengine
2016-03-08 17:59:06 -05:00
aef82d5c9e
create screenspacerenderable
2016-03-08 15:11:59 -05:00
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
7b1670ea0b
Remove startup warnings
2016-02-21 01:50:51 +01:00
794bbcedda
Fix more GLM degrees->radians changes
2016-02-05 22:48:49 +01:00
f266f0bcee
Updated copyright header
2016-02-05 22:47:37 +01:00
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
86e6c21f96
- Make missing SGCT a non-fatal error in CMake
...
- Add screen sizes to the abuffer dictionary
- Use the new method for setting the screen size in the star rendering
2016-02-04 21:41:17 +01:00
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
bae8d0aa76
Making OpenSpaceTest application compile with API change
...
Set default start to July 2015
Move default window out of the corner
Compile fixes
2016-01-14 16:05:29 +01:00
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
0735d0fc2d
More cleanup of FactoryManager
2015-12-14 17:55:24 -08:00
177571195c
Completely remove references to constants.h
2015-12-14 17:36:15 -08:00
c92fc923f9
Remove constants.h file
...
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
6eca5c0f68
More module cleanup
2015-12-14 11:46:44 -08:00
2fce471743
Started cleanup of module structure
2015-12-14 10:50:38 -08:00
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
ae55078ff8
Updated Ghoul version
...
Adapted to changed Ghoul API
Reenable fading of ScreenLog messages
2015-12-11 16:50:21 -05:00
cd3a819541
Updating Ghoul version
...
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
999f198aa3
Updated tinyobjloader and applied the changes
2015-11-30 15:01:02 -05:00
383c7028a8
Applied changes in texture reading io classes to OpenSpace
2015-11-24 18:15:23 -05:00
3806318b0d
Applied Ghoul cleanups
2015-11-22 21:26:02 -05:00
2cc1a91fad
Rename SpiceKernelException to SpiceException
2015-11-21 23:15:48 -05:00
443963a151
Finished cleanup of SpiceManager
2015-11-20 18:36:03 -05:00
2c84368b0b
More cleaning of SpiceManager
2015-11-20 00:54:19 -05:00
16897bb8d4
Make the aberration correction specification for targetPosition in SpiceManager explicit by including a seprate class for it
2015-11-19 15:33:57 -05:00
11fec9387b
More changes on the documentation and Exception handling in SpiceManager
...
Change some interfaces on SpiceManager
Removed target position return in powerscaled coordinates and only use glm::dvec4 instead as the Spice library does not have higher accuracy anyway
2015-11-19 13:40:44 -05:00
fad2c642f8
Cleanup of SpiceManager by introducing exceptions
...
Catch exceptions in RenderableShadowCylinder and LabelParser
Catch exceptions in RenderableFov and Hongkangparser
2015-11-18 21:55:25 -05:00
f7f5f2e262
Started cleanup of SpiceManager
...
Clean boost message output
Update to new Ghoul with cppformat library
2015-11-17 23:54:54 -05:00
390f5be4a8
Removing includes of sgct.h
2015-10-26 16:14:38 -05:00
1ca4b9c285
Enable NOMINMAX compiler defintions in Windows on default
2015-10-13 00:15:44 +02:00
72ba616414
Merge branch 'develop' into feature/remote_redesign
...
Conflicts:
modules/base/shaders/path_fs.glsl
2015-07-07 20:31:01 +02:00
9e06b612a7
Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0
2015-07-07 11:17:56 +02:00
003a438602
Removed while loops from path_vs that caused driver issues with big w values
...
Removed error that caused the postDraw method not to be called on slave nodes
2015-07-04 15:41:43 +02:00
40c42ff772
Fix the scaling of renderablemodel by making the magnification a floatproperty
2015-07-01 17:56:51 +02:00
bbca384a9c
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-06-25 20:29:27 -04:00
4e72e248c3
Fixing bug in model magnification
2015-06-25 20:07:21 -04:00
5227ce2213
Renamed OpenSpaceModule's initialize method to create
...
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
Michael Nilsson