Commit Graph

5575 Commits

Author SHA1 Message Date
Jonathan Grangien 58f563ffae Fix transferfunction usage so it binds texture 2018-05-04 14:53:04 -04:00
jon-grangien c3d0267211 Change usage of transferfunctionhandler to core package transferfunction 2018-05-04 11:55:30 -04:00
Jonathan Grangien 8581529319 Debug transfer function handler usage of classes 2018-04-30 15:39:27 -04:00
Jonathan Grangien c3834f68af Fix namespace indentation in a couple of files 2018-04-30 13:31:49 -04:00
Jonathan Grangien 6f48330e3b Change time keybindings in assets 2018-04-30 11:24:34 -04:00
Jonathan Grangien c2232760e5 Rename files and folders 2018-04-30 10:40:00 -04:00
Matthias Berg d1e58f17e3 Add mas-transferfunction file 2018-04-25 15:33:31 -04:00
Matthias Berg d05b7027df Better adapt to MAS 2018-04-25 14:02:06 -04:00
Matthias Berg c87d784656 Test MAS model rendering with existing functionality 2018-04-25 11:04:52 -04:00
Jonathan Grangien 4ddcc3bef2 Put stb_image includes first in image reader order for linux 2018-04-25 11:04:52 -04:00
Jonathan Grangien 00b37aaf0a Move stb_image reader first in reader order
Seems better to let it handle the common file types instead of FreeImage
on linux
2018-04-25 11:04:52 -04:00
Alexander Bock a881eef156 Cleanup in Renderers 2018-04-22 09:15:42 +00:00
Alexander Bock 7068637c9d Make it possible to click on the friction markers in the image to toggle the friction (closes issue #576) 2018-04-21 19:04:47 +00:00
Alexander Bock f7e5ba8fff Closes #604
Remove identifier from VirtualPropertyManager
Add VirtualPropertyManager to the query of allProperties
2018-04-21 14:34:15 +00:00
Alexander Bock 5e1f26cc6b Issue/372 (#606)
* Add commandline argument that applies a Lua script to the configuration
2018-04-21 09:54:05 -04:00
Alexander Bock 8a902efb26 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-04-21 08:28:42 -04:00
Alexander Bock db66084ad8 Fix warnings and coding style issues 2018-04-21 08:27:20 -04:00
Alexander Bock d0368a2edd Fix warnings and coding style issues 2018-04-21 08:26:59 -04:00
Alexander Bock 818ee225a5 Define a Cache path on default
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
2018-04-21 07:00:43 -04:00
Alexander Bock 8aa4c4fa42 Update copyright headers 2018-04-21 00:44:54 -04:00
Alexander Bock a9b981d718 LLVM compile fixes
Updated to new Ghoul commit
2018-04-20 23:12:13 -04:00
Jonathas Costa d5af5aab5d Fixed interaction of trail points with ATM. (#602)
* Fixed interaction of trail points with ATM.
* Added fix from SunEarh day.
2018-04-20 22:47:17 -04:00
Alexander Bock b4be63af65 Feature/configuration (#605)
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
2018-04-20 18:40:21 -04:00
Alexander Bock 3810209365 Issue/451 (#595)
* Add ability for Joystick input
* Change location of LuaConsole files
2018-04-20 16:12:18 -04:00
Alexander Bock a9fa9117f6 Update Ghoul 2018-04-20 15:39:43 -04:00
Alexander Bock a1e1c3841a Remove option from torrentclient to auto-select a port 2018-04-19 13:36:32 -04:00
Alexander Bock 4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
Alexander Bock 12db1dd0c2 Fix Norrköping WMS servers 2018-04-17 18:44:02 -04:00
Alexander Bock 20b8319161 Forward mouse-released events to the navigation handler regardless of whether a callback has consumed them 2018-04-12 10:02:04 -04:00
Alexander Bock 0b332a586a Render Saturn's rings without warnings (closes #584) 2018-04-12 09:50:21 -04:00
Alexander Bock 09e7a642bf Fix correct aspect ratio 2018-04-10 17:24:27 -04:00
Alexander Bock 1c70f9145b Feature/focusmarkers (#594)
* Add function to optionally automatically create focus nodes based on info files
2018-04-10 16:12:28 -04:00
Alexander Bock 40dbf875c5 Issue/525 (#593)
* Add initializeGL and deinitializeGL methods to OpenSpaceModule Call releaseAll from ProgramObjectManager in deinitializeGL to guard against errors when deinitializing assets

* Change removeProgramObject function in RenderEngine to take a non-owning pointer instead of a reference to a unique pointer to make it compatible with the ProgramObjectManager
Update Ghoul repository

* Using ProgramObjectManager in more modules to reduce the number of programs compiled at startup
2018-04-10 15:55:52 -04:00
Alexander Bock 34987e9f85 Prevent floating point over- and underflows; specifically when interpolating the camera position (closes #575) 2018-04-10 15:04:41 -04:00
Alexander Bock 62eca12e25 Enable 'tracked' viewports on default 2018-04-09 14:33:02 -04:00
Alexander Bock 233dc50a92 Change the default FOV to 40 degrees (closes #590) 2018-04-09 14:25:40 -04:00
Alexander Bock 07e995187a Pass radius of planets into the skirt length computation rather than use a fixed minimum length (fixed #582) 2018-04-09 13:37:06 -04:00
Alexander Bock cae4ed9ce0 Sort nodes in GlobeBrowsing UI by whether they have URLs associated with them or not (closes #580) 2018-04-09 10:20:36 -04:00
Alexander Bock ae7e22dfe0 Adapt to typesafe ghoul::Boolean parameters 2018-03-30 13:03:17 -04:00
Alexander Bock 9177f5f432 Enable clearing multiple keys with the same function call
Slightly speedup application close
2018-03-30 00:01:57 -04:00
Emil Axelsson 182e344f30 Change Name to Identifier in globe browsing helper code (#567) 2018-03-29 18:02:17 +02:00
Emil Axelsson 0547c14389 Fix dashboard item bugs related to unloading and loading assets at runtime (#572) 2018-03-29 18:00:47 +02:00
Emil Axelsson 246f583119 Jenkins compile fix 2018-03-29 09:12:49 +02:00
Emil Axelsson 04ff9d119b Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-03-28 16:22:09 +02:00
Emil Axelsson 48880db372 Update ghoul and fix compilation 2018-03-28 16:21:34 +02:00
Emil Axelsson 1ede0a2f21 Cleanup css 2018-03-28 09:31:10 +02:00
Emil Axelsson 5cfef52044 Improve html log 2018-03-27 18:04:23 +02:00
Emil Axelsson cf31aebf7b Fix bugs with custom passwords in Wormhole server 2018-03-23 16:26:39 +01:00
Gene Payne 5380636932 Update of touch table interface code (#561)
* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Update starlabels.data file

* Enable minimum picking distance in NDC

* Fix stack corruption bug in TouchMarker

* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Fix stack corruption bug in TouchMarker

* Add time limit to levmarq solver

* Add debug properties to touch GUI with a compile time flag

* Guard against accessing outside bounds

* Added exponential zoom for faster zoom with increased distance from focus node

* Refined the exponential zoom for better behavior on the touch table

* Added properties for disabling panning and node boundary sphere multiplier for zoom

* Added more debug logging and stopped using camera focusNode (looks deprecated) for distance calculation

* Found error in the deceleration algorithm

* Default-disable debug logging, exponential zoom coeff change and additional debug log statement
2018-03-20 10:25:28 -04:00
Gene Payne 9a44d9c9df Modified SGCT configuration commands to allow aspect ratio tracked keyword in openspace config file (#560) 2018-03-20 10:24:01 -04:00