c20cd80eaa
Merge globebrowsing, resolve conflicts
...
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
3badd4158e
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-09-07 15:47:08 -04:00
66640c28bf
Add planet mercury as a RenderableGlobe and use in osirisrex.scene
2016-09-07 15:46:53 -04:00
672581a065
Add lod moon to scene.
2016-09-07 15:40:45 -04:00
7416d7ca69
Update mod files for osirisrex
2016-09-06 22:57:29 -04:00
82618bfd99
Improve temporary atmosphere rendering
2016-09-06 20:32:49 -04:00
1195ff9619
Remove excessive debug logging in TileDataset
2016-09-03 18:28:47 -04:00
16b79759b9
Don't flush log immediately
2016-09-03 18:09:55 -04:00
697afc4959
Generate OpenSpace windows located in a grid
2016-09-03 17:39:33 -04:00
d59156e81b
Enable render global frame number and add as global property
2016-09-02 18:23:44 -04:00
46107cc23f
run_multiple_nodes generates and reads xml in same directory as itself
2016-09-01 15:54:21 -04:00
5cf1a4fbe1
Enable per frame toggling of RenderableGlobes for multi node sync debugging
2016-09-01 15:31:38 -04:00
2bb3379d66
Log isUsingSwapGroups and isSwapGroupMaster after initialization and before deinitialization
2016-09-01 15:30:07 -04:00
b9c76034ba
Move and improve node script for starting multiple instances of OpenSpace
2016-09-01 15:28:47 -04:00
9bdbf95961
--amend
2016-09-01 15:25:56 -04:00
cc2c26a3e7
Enable OpenSpace checking isUsingSwapGroups and isSwapGroupMaster
2016-09-01 15:19:25 -04:00
134ece1293
Add size reference for LodEarth
2016-08-31 16:43:15 -04:00
b8fb3dcbe6
SizeReferenceTileProvider hashes based on tile sizes instead of chunk indices
2016-08-31 16:42:48 -04:00
c201957001
SizeReferenceTileProvider renders referred distance next to its text
2016-08-31 14:38:05 -04:00
b064c5606f
Add new TileProvider implementation SizeReferenceTileProvider and add to lodMars
2016-08-31 13:27:36 -04:00
4a5dd1dacb
Add longitudal distance and great circle distance to class Ellipsoid
2016-08-31 13:25:33 -04:00
41194d33d4
Add Ellipsoid radii accessor and return const refs instead of copies
2016-08-31 11:08:16 -04:00
8d17ad7e34
Remove TileProviderFactory and instantiate TileProviders using FactoryManager instead
2016-08-30 23:52:53 -04:00
b56eeade88
Fix misspelling of SingleImageProvider
2016-08-30 20:05:16 -04:00
bf1dddf103
Separate Tile and TileProvider. Remove necessary includes
2016-08-30 19:26:22 -04:00
b5b6b38dce
Use globe browsing scene
2016-08-30 19:24:49 -04:00
87e3b81b68
Merge branch 'develop' into feature/globebrowsing
2016-08-30 18:58:23 -04:00
1be37a9333
Add a simple abstract class for providing Tiles with text. Refactor ChunkIndexTileProvider
2016-08-30 18:15:00 -04:00
af5c0c71e8
More explicit scheduled script helpers and set osiris rex trails enabled values at launch
2016-08-30 15:37:33 -04:00
a50cb8d06a
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-30 15:06:35 -04:00
64be557abf
Use alpha from projection texture in RenderableModelProjection.
2016-08-30 14:17:00 -04:00
73c4cb795b
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-30 14:04:39 -04:00
69681ea36e
Move helper lua functions for script scheduling to scripts/common.lua
2016-08-30 14:03:19 -04:00
5e31638b92
Enable the global Lua state when loading scheduled scripts from file
2016-08-30 14:01:42 -04:00
8c137a78b2
Add scheduled scripts for enabling different Bennu trails
2016-08-30 13:34:56 -04:00
e7d8308537
Add objects to the osiris rex scene
2016-08-30 13:23:21 -04:00
6b1369f58c
Log at info level when scheduled scripts are executed
2016-08-30 13:16:10 -04:00
53a626a0ea
Solve merge conflict
2016-08-30 13:12:45 -04:00
357462adac
Update osirisrex.mod and spice kernel loading order
2016-08-30 13:01:55 -04:00
06b7c0776e
Press F4 to reload scheduled scripts from file during run time
2016-08-30 12:28:35 -04:00
0ee638f447
Enable clearing scheduled scripts
2016-08-30 12:26:10 -04:00
99309b3cb3
Use more explicit names for different osiris rex trails
2016-08-29 16:52:18 -04:00
6206b47ef9
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-29 16:16:21 -04:00
b74b01d294
Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua
2016-08-29 16:16:11 -04:00
e55cbaff8c
Normalize surface normal in for Rednerable globe shader and enable water mask and night texture for LodEarth in osirisrex.
2016-08-29 13:48:05 -04:00
84834f230d
Merge branch 'develop' into feature/osirisrex
2016-08-29 13:01:28 -04:00
67f1a389d2
Move back to default.scene
2016-08-29 14:55:37 +02:00
35462c2c53
Add improved rosetta model
2016-08-29 13:22:15 +02:00
46686d55eb
Set default magnification value to 1
2016-08-29 11:56:26 +02:00
193e2bdc64
Fix linking error when OpenSpace is compiled without the globebrowsing module
2016-08-29 10:45:59 +02:00
Erik Broberg