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
78f2f0a35e
Some more cleanup of RenderEngine
2017-02-27 16:40:50 -05:00
Alexander Bock
0d03177d43
Feature/globebrowsingcleanup ( #230 )
...
* Initial restructuring of the Globebrowsing branch
* Update Ghoul repository
Fix include guards
* More cleanup
* Split texttileprovider subclasses into separate files
* Move TileProviders into namespace
* Convert static class methods into free functions
* Splitting tile subclasses into their own files
Remove `using namespace` from header file
* Split TileDataSet subclass into separate file
Update SGCT reference
* Move shader preprocessing data into internal class
* More Globebrowsing cleanup
* More cleanup
Remove unused Convexhull class
2017-02-15 21:20:05 +01: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
d139dd2d22
Clean include guards in OpenSpace core
...
Remove unused files
2016-12-09 13:54:22 +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
kalbl
0df09d23ad
Add possibility to switch geographic position
2016-11-29 13:29:02 +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
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
kalbl
d914261bd2
Solve conflict
2016-11-08 00:08:28 +01:00
Alexander Bock
85f298a659
Add documentation to openspace.bindKeys script
2016-11-05 16:23:05 +01:00
kalbl
dddb85d538
Solve build error when globe browsing module is inactive.
2016-10-24 10:24:42 +02:00
kalbl
2f32e67b87
Set interaction to properly depend on delta time.
2016-10-20 18:37:18 +02:00
kalbl
7f62bd7206
Create namespace globebrowsing.
2016-10-18 15:40:27 +02:00
kalbl
c516dc5b25
Solve conflict in scripts/common.lua
2016-10-11 17:51:57 +02:00
kalbl
6ef366afdd
Add smooth transition when resetting camera direction.
2016-10-05 01:47:49 +02:00
Emil Axelsson
b448b0ec5e
Move all network namespace members into the openspace namespace
2016-09-30 14:13:36 +02:00
Emil Axelsson
4f61479190
Move network status into parallel connection class
2016-09-30 13:36:35 +02:00
Emil Axelsson
14a42b1bd8
Potentially fix compile errors
2016-09-30 13:06:27 +02:00
kalbl
831664c032
Update all interaction to be possible without a middle mouse button.
2016-09-29 22:20:35 +02:00
Emil Axelsson
cd325686ad
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
...
Conflicts:
include/openspace/engine/openspaceengine.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/network/parallelconnection.cpp
src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Alexander Bock
329986c0c6
Merge branch 'develop' into feature/globebrowsing
...
Conflicts:
modules/base/scale/staticscale.cpp
modules/base/scale/staticscale.h
modules/globebrowsing/meshes/trianglesoup.h
modules/globebrowsing/tile/tiledataset.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
Emil Axelsson
fa8eee5386
sync camera movement over parallel connection
2016-09-19 14:49:57 +02:00
Emil Axelsson
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
Emil Axelsson
41fafcb5df
begin refactor parallel connection
2016-09-08 18:04:06 +02:00
Erik Broberg
047e754369
Remove serialize() and deserialize() from InteractionHandler and InteractionMode
2016-09-06 13:53:31 -04:00
Alexander Bock
e3d5a9ca38
Cleaned up Doxygen
...
Removed Doxygen warnings
Documented Property specializations (closing #10 )
2016-09-05 17:01:32 +02:00
Erik Broberg
649d8d2f67
Remove shared and synced versions of data members in MouseStates
2016-09-03 22:54:02 -04:00
Erik Broberg
2116f5c987
Rename preSync and postSync in InteractionHandler to more descriptive names
2016-09-03 22:14:10 -04:00
Alexander Bock
193e2bdc64
Fix linking error when OpenSpace is compiled without the globebrowsing module
2016-08-29 10:45:59 +02:00
Alexander Bock
6d20c8301f
Remove Globebrowsing restrictions from InteractionHandler header file
2016-08-29 01:07:27 +02:00
Alexander Bock
be67131c33
Remove Globebrowsing restrictions from InteractionHandler header file
2016-08-29 00:56:28 +02:00
Erik Broberg
23c4a05a96
Merge from globebrowsing
2016-08-17 20:25:58 -04:00
Erik Broberg
d4f635513d
Merge branch 'develop' into feature/globebrowsing
2016-08-17 19:53:28 -04:00
Alexander Bock
6c43d8404a
Added missing files
2016-08-17 16:27:13 +02: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
Kalle Bladin
d91dd3dbb7
Implement ability to update camera in two steps. still using old method.
2016-08-04 19:16:36 -04:00
Kalle Bladin
541fbba322
Merge with develop and solve conflicts.
2016-07-18 17:26:30 -04:00
Alexander Bock
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00
Alexander Bock
dc32dfe075
Added functionality to print all keybindings to file when a scene is loaded
2016-07-14 00:28:09 -04:00
Kalle
7e7a1cb720
Change friction to bool properties
2016-07-13 11:29:29 -04:00
Kalle
fc53905131
Store interaction modes in interaction handler in a std::map
2016-07-01 13:13:31 -04:00
Kalle
3c7d1e22fc
Globe browsing interaction mode follows the rotation of the globe.
2016-07-01 12:46:16 -04:00
kbladin
a89f474502
Solve merge conflict and add properties for friction and interaction parameters.
2016-06-30 14:07:51 -04:00
Kalle Bladin
161d722623
Enable setting of friction, sensitivity and followscalefactor in interaction handler.
2016-06-29 21:13:04 -04: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
Kalle Bladin
35a095c448
Change camera dictionary state representation to consider position, rotation and focus node.
2016-06-29 15:23:37 -04:00
Kalle Bladin
6cb82f691a
Save and restore camera state as lua tables.
2016-06-29 13:04:41 -04:00
Kalle Bladin
5807919ac7
Start changing camera write and restore functions.
2016-06-29 10:45:26 -04:00
Kalle Bladin
e5ccf185cd
Remove rotation state variables from interaction mode and enable more freely local rotation.
2016-06-28 22:28:56 -04:00
