Alexander Bock
5192f312fb
Enable LabelParser to load different file extensions by querying the TextureReader supported extensions (closing #89 )
2016-09-12 20:39:14 +02:00
Alexander Bock
9135f6141a
Fix crash with parser getting being destroyed prematurely
2016-09-12 20:38:48 +02:00
Alexander Bock
32ca42ebaa
Some work on the Decoder and ImageParser to make the ownership of data more clear
2016-09-12 19:50:59 +02:00
Alexander Bock
965f3eded0
Clang compile fixes
2016-09-08 13:22:34 +02:00
Alexander Bock
69f72718c0
Enable the change of projection texture size in ProjectionComponent (closing #105 )
...
Make the Shadowmapping in RenderableModelProjection optional by setting a value in the mod file
2016-09-07 14:16:16 +02:00
Alexander Bock
3785d30ff6
Ability to enable and disable the ShadowMapping
2016-09-07 10:35:05 +02:00
Alexander Bock
0060e4782a
Adding a configuration value to ProjectionComponent that determines the aspect ratio of the projection texture (default = 1.0)
2016-09-01 09:54:49 +02:00
Alexander Bock
6884eca40e
Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta
...
Conflicts:
modules/newhorizons/rendering/renderablemodelprojection.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
modules/newhorizons/util/projectioncomponent.cpp
2016-08-29 18:34:18 +02:00
Erik Broberg
25705962cd
Before accessing current mission, check if available
2016-08-23 19:53:53 -04:00
Erik Broberg
6952b526cc
Unable to load mission file is an error
2016-08-23 18:47:28 -04:00
Erik Broberg
3291bb5ac0
Render nested mission phases
2016-08-22 19:18:34 -04:00
Erik Broberg
81f72e0e92
Move TimeRange to OpenSpaceLib
2016-08-22 15:27:16 -04:00
Erik Broberg
37bb16baa8
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-22 15:03:39 -04:00
Erik Broberg
f1c705fa19
Add mission description
2016-08-22 15:03:30 -04:00
Erik Broberg
b6429183d6
Move parsing of time range to TimeRange class
2016-08-22 13:13:57 -04:00
Erik Broberg
46f005fa58
Add Mission related classes. Add basic mission phase viz. Move TimeRange to separate file
2016-08-22 11:53:59 -04:00
Kalle Bladin
d042f6c4be
Merge branch 'develop' into feature/osirisrex
2016-08-19 12:33:49 -04:00
Emil Axelsson
6d56b1d38a
implement shadow mapping for image projections on non-convex bodies
2016-08-19 16:56:57 +02:00
Erik Broberg
8f8114fabf
Image has a TimeRange instead of two doubles
2016-08-18 18:23:52 -04:00
Erik Broberg
ae25a171a6
Use proper default values- and clearify interface of TimeRange
2016-08-18 17:55:31 -04:00
Alexander Bock
2ae7095d9b
Fix image dilation (closing #108 )
...
- Using pixel(=texel) coordinates and integer offsets
- Using a single channel stencil texture instead of a 4-channel one
2016-08-18 16:29:00 +02:00
Alexander Bock
72e1e9231a
Add an update method to the ProjectionComponent that takes care of Shader rebuildin
2016-08-18 16:27:44 +02:00
Alexander Bock
788ec99575
Merge branch 'develop' into feature/projectiontexturemap
...
Conflicts:
support/cmake/support_macros.cmake
2016-08-18 13:23:55 +02:00
Alexander Bock
e284543434
Make use of a secondary stencil buffer for masking the dilation areas
2016-08-18 11:43:51 +02:00
Erik Broberg
23c4a05a96
Merge from globebrowsing
2016-08-17 20:25:58 -04:00
Alexander Bock
c93d882ea6
Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
...
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Alexander Bock
4f1fe0dd49
Add optional image dilation to the ProjectionComponent
2016-08-17 11:25:29 +02:00
Erik Broberg
bc9befc970
Clean up ghoul dict parsing in InstrumentTimesParser construcor
2016-08-11 15:40:09 -04:00
Erik Broberg
88ab0147bf
Fix bug causing the instrument times parser to only work in Debug mode
...
OBS: ghoul asserts are removed in Release mode. So don't put crucial
statements that will have side effects in a ghoul assert. This is what
caused the bug which is fixed in this commit.
2016-08-11 13:03:55 -04:00
Erik Broberg
72252d6a47
Use place holders for projected images (UV coordinates still not working)
2016-08-09 20:31:06 -04:00
Erik Broberg
19ab82174d
Parse basic instrument event times data
2016-08-08 16:44:50 -04:00
Erik Broberg
088bb8bca2
Loading event data incorrectly is a non-silent error
2016-08-08 12:53:57 -04:00
Erik Broberg
22d125c192
Add unimplemneted class InstrumentTimesParser
2016-08-05 13:25:02 -04:00
Erik Broberg
e664929bf2
Allow SequenceTypes to have multiple parsers
2016-08-05 13:19:19 -04:00
Alexander Bock
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
Alexander Bock
4068ec747b
Remove CppCheck warnings
2016-07-28 18:04:08 +02:00
Alexander Bock
6f05ed3b98
Make ProjectionComponent an actual component rather than using inheritance
2016-06-29 23:27:01 +02:00
Alexander Bock
e85144b4eb
Performance optimization of ImageSequencer::instrumentActive
2016-06-06 00:45:40 +02:00
Alexander Bock
25b49e882d
Automatically remove placeholder.png for the projection cases where a real image is available
2016-06-05 16:11:06 +02:00
Alexander Bock
9a3818f007
ProjectionComponent always loads the placeholder textures and reuses it
2016-06-04 20:58:58 +02:00
Alexander Bock
ef75066478
Rename projection shaders to more sensible names
2016-06-04 20:42:10 +02:00
Alexander Bock
3d82173ff0
Don't set alpha value to 1.0 for all projection images
2016-06-04 20:33:17 +02:00
Alexander Bock
2700ef6ea8
Moving potential targets into ProjectionComponent
2016-06-04 13:45:55 +02:00
Alexander Bock
4dda541d1f
More work on refactoring RenderablePlanetProjection and RenderableModelProjection
2016-06-04 13:38:50 +02:00
Alexander Bock
491226ea7a
Started refactoring RenderableModelProjection and RenderablePlanetProjection to place common code into ProjectionComponent
2016-06-03 18:30:16 +02:00
Alexander Bock
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
a21c9538b6
Untabify more files
2016-04-18 15:15:30 +02:00
Alexander Bock
c8da825098
Rename ImageSequencer2 to ImageSequencer
2016-04-18 15:14:59 +02: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
