Commit Graph

1299 Commits

Author SHA1 Message Date
Erik Broberg 82e3dd95c3 Bennu does not have specular light. Fix upper case naming error 2016-08-09 21:03:48 -04:00
Erik Broberg 740bd7dc08 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-09 20:32:48 -04:00
Erik Broberg 72252d6a47 Use place holders for projected images (UV coordinates still not working) 2016-08-09 20:31:06 -04:00
Kalle Bladin 6b9358f975 Update path to consider line fade and create proper bounding sphere for renderable model. 2016-08-09 19:59:51 -04:00
Erik Broberg df1afdad36 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-09 12:25:48 -04:00
Kalle Bladin 08431d3d88 Add the ability to choose point steps in path rendering. 2016-08-09 11:49:43 -04:00
Kalle Bladin fb87842b1b Update path rendering to higher precision. 2016-08-08 22:35:37 -04:00
Erik Broberg a0924588fd Calculate RenderableModelProjection target position in double precision 2016-08-08 20:23:46 -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
Erik Broberg d6aa4216cc Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-02 19:25:39 -04:00
Erik Broberg 64668e9feb Merge from feature/globebrowsing 2016-08-02 19:25:23 -04:00
Kalle Bladin 4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Erik Broberg 244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Erik Broberg e832b953c1 Reenable showing height intensities and resolution (after commit 06a5336961) 2016-08-02 18:09:14 -04:00
Alexander Bock 06a5336961 Fix debugging with Clang
Removed include of vertex operations in fragment shader
2016-08-02 11:39:57 +02:00
Alexander Bock 93b30f5078 Some cleanup of RenderableShadowCylinder 2016-07-31 22:23:20 +02:00
Alexander Bock 3fb6d3aa84 Some cleanup of RenderableFov 2016-07-31 21:43:55 +02:00
Alexander Bock 7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +02:00
Alexander Bock 5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock 405c66d6f8 Enable separate orientation setting for non-equatorial rings 2016-07-29 13:28:44 +02:00
Alexander Bock 9f1abc67a2 Enable setting the texture offset for rings
Enable setting the color-based transparency for rings
2016-07-29 13:23:43 +02:00
Alexander Bock 635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02: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 f4f4e7de9e More Jenkins compile fixes 2016-07-27 11:01:58 +02:00
Alexander Bock 60ce1872bd Include correct directory for GDAL on non-Win32 systems 2016-07-27 09:25:17 +02:00
Alexander Bock 67e8608581 Use the include paths to search for gdal_priv.h 2016-07-26 17:00:29 +02:00
Alexander Bock 0062276d45 Fix case for TileProviderManager 2016-07-26 16:05:03 +02:00
Matthew Territo 2abd1951fa Add display option to OptionProperty
For displaying as Radio or Dropdown
2016-07-22 19:07:32 -06:00
Kalle 93d661bfc6 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace-Development into feature/osirisrex 2016-07-22 17:06:02 -04:00
Kalle 5883d75047 Update render function in renderable model to avoid precision errors and remove psc dependency. 2016-07-22 17:05:34 -04:00
Erik Broberg 73e3c71b9a Init StatsCollector to disabled and delete committed stats data 2016-07-21 17:42:35 -04:00
Erik Broberg dd01953f7c Enable disabling rendering of RenderableGlobe 2016-07-21 17:13:55 -04:00
Erik Broberg f4fa144606 Use shorter struct name. Previous name caused linker error LNK1179 2016-07-21 16:57:48 -04:00
Kalle Bladin 541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock a244defdbc Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers
- Making the GUI use the new function setPropertyValueSingle to not incur the overhead of compiling the regex
 - The default setPropertyValue Lua function uses a wildcard, which replaces a * with the correct regex (.*) for ease of use
 - The setPropertyValueRegex Lua function allows a full regular expression to be used

Closing #108
2016-07-18 20:12:24 +02:00
Erik Broberg 6691dab91e Init default rotation matrix to unit matrix explicitly 2016-07-18 13:50:47 -04:00
Alexander Bock f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Erik Broberg 50735fde80 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 19:01:15 -04:00
Kalle Bladin 1d9aab6e63 Remove datasets from debugglobe.mod 2016-07-15 18:57:03 -04:00
Erik Broberg 7568912a7d Bounding chunk heights considers multiple heightmaps and handles missing data 2016-07-15 18:56:03 -04:00
Kalle Bladin e19a68eb1e Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 17:18:29 -04:00
Erik Broberg 2ec2c95cd7 Add forgotten updates for last commit 2016-07-15 17:16:48 -04:00
Kalle Bladin 403ecd8209 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 17:13:05 -04:00
Erik Broberg a2cd9bc19d Add static const CHUNK::DEFAULT_HEIGHT to avoid magic numbers in code 2016-07-15 14:21:29 -04:00
Kalle Bladin 4a9d03c54f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 13:57:33 -04:00
Erik Broberg d06c470636 Fix bounding heights (used for culling) for chunks with heightmap overlays 2016-07-15 13:48:00 -04:00