Commit Graph

145 Commits

Author SHA1 Message Date
Alexander Bock
63af7e67f9 Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass (closes #260) 2017-03-03 18:39:35 -05:00
Alexander Bock
1689dc4047 Move the PropertyOwner name specification into the constructor and adjust accordingly 2017-03-02 18:25:13 -05:00
Alexander Bock
aba3536caa Don't assert if the focus node is not found if there are no nodes at all 2017-03-02 17:32:20 -05:00
Alexander Bock
d6b5bb753b - Some cleanup of LuaConsole
- Moved dedicated Lua commands into a visible property
  - Disallow non-ASCII characters
- Remove unused KeyboardController
- Remove unused DeviceIdentifier
- Some cleanup of LogFactory
  - Move and use documentation into the class
2017-03-02 14:27:18 -05:00
Alexander Bock
8910aac834 - Replace window name check with tag check for GUI code (closing #258)
- Only show GUI, console, and screenlog on the GUI window
2017-02-28 20:38:58 -05:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock
6c4efc4eec Move OpenSpaceEngine::isMaster method into WindowWrapper class 2017-02-25 11:29:28 -05:00
Alexander Bock
965cf6bd9a Fix crash that occurs if there is an error in the SGCT configuration file 2017-02-22 15:31:59 -05:00
Alexander Bock
11fbff5fbc Reduce the dependency of libOpenSpace on modules
- Enable module callbacks for OpenSpaceEngine
 - Add OpenSpaceModule function that returns a Lua library
2017-02-16 16:43:34 -05:00
Alexander Bock
6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
df543f0ec3 Cleanup of license headers
Cleanup of include guards in modules
2016-12-09 12:02:16 +01:00
Alexander Bock
b3be4180de Clean data/scene folder; remove lodesritest and restructure lodglobes folders
Fix various issues in mod files
Remove backslash from file paths in StringProperty
2016-12-09 10:21:17 +01:00
Alexander Bock
2a3b532745 Add display of double precision properties to ImGui
Do not show date text when render information is hidden
Add Utah WMS files
2016-12-09 09:04:53 +01:00
Alexander Bock
341bc8b105 Merge branch 'develop' into feature/globebrowsing
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00
Alexander Bock
fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +01:00
Alexander Bock
af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +01:00
Alexander Bock
b00595af40 Replacing const std::string with const char* to reduce binary size and initialization costs 2016-11-23 23:52:16 +01:00
Alexander Bock
7ffcf81235 Add visibility setting to the property classes (closing #166) 2016-11-23 23:24:07 +01:00
kalbl
a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Alexander Bock
683fc8ee53 Pr/trails (#170)
* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
2016-11-23 10:35:46 +01:00
Alexander Bock
db923209c3 Show PerformanceMeasurements independently of the Gui visibility
Replace settings in performance measurements with properties
2016-11-22 10:16:17 +01:00
Alexander Bock
f711e192fb Replace explicit Lua commands to toggle onscreen gui with a global property 2016-11-22 09:49:22 +01:00
Alexander Bock
789f931979 Change 'addImage' to add the image when enter is pressed
Automatically show performance window when performance is measured
Cleanup of GUI module
2016-11-15 21:56:38 +01:00
Alexander Bock
3831e406cf Convert native path tokens to Lua supported tokens for adding a screenspace image (closing #168) 2016-11-14 18:52:57 +01:00
Alexander Bock
92676c107f Remove wrong type of whitespace
Remove circular header dependency
Increase the time setting of the GUI
2016-11-12 11:16:15 +01:00
Alexander Bock
572257d3b0 Move the rendertime into a property and remove the toggleFrametimeType
Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
2016-11-06 22:15:52 +01:00
Alexander Bock
c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Alexander Bock
ed4b8c9fa8 Store Translation, Rotation, and Scaling Performance measurements
If no special sorting is requested in Performance GUI, sort by name
2016-10-28 12:52:54 +02:00
Alexander Bock
cfd71d6c8d Sort properties by name in the GUI 2016-10-28 11:46:14 +02:00
Alexander Bock
317ecad9ac Potential fix for High-DPI and manual framebuffer sizes by using SGCT window scaling 2016-10-23 22:55:26 +02:00
Alexander Bock
b444bfd77a Making iSWA compile with the changes in the ScriptManager 2016-10-23 21:49:04 +02:00
Alexander Bock
febf8c9a1b High-DPI fixes for ImGUI 2016-10-19 15:54:19 +02:00
Alexander Bock
e6720103fd Updated ImGUI version to 1.49 2016-10-19 15:42:45 +02:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Erik Broberg
1dd569a3e1 Solve merge conflicts and fix bug in LayeredTextureUniformProvider 2016-08-11 17:05:14 -04:00
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock
50dd45fbb1 Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node 2016-08-01 16:20:23 +02:00
Alexander Bock
7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +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 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
Alexander Bock
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Kalle
8fcaaf2799 Merge remote-tracking branch 'origin/develop' into feature/globebrowsing 2016-07-13 12:09:02 -04:00
Erik Broberg
1e4247b80b Reduce value rnage of delta time slider in GUI 2016-07-10 18:15:05 -04:00
Alexander Bock
20d0fb8474 Fix error in Dictionary construction for ScreenSpaceRenderable
Do not access the std::future for cases where a download is not necessary
2016-07-03 14:34:17 +02:00
Alexander Bock
5a5ffd76bb Add InteractionHandler to global property gui
Add property to interactionhandler to enable/disable rotational and zoom friction
2016-06-29 22:42:12 +02:00
Alexander Bock
2f9b873f1c Group properties in the Gui based on the group identifier 2016-06-29 19:45:45 +02:00
Alexander Bock
443a0121b1 Merge branch 'feature/gui-cleanup' of https://github.com/OpenSpace/OpenSpace-Development into feature/gui-cleanup 2016-06-29 17:47:13 +02:00
Alexander Bock
a56ce8d3f5 Clang compile fixes 2016-06-29 16:40:20 +02:00