Alexander Bock
30264fb00e
Add Lua function to check whether a specific module is loaded (closing #36 )
2016-06-04 19:38:56 +02:00
Alexander Bock
1e8d329e3d
Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95 )
2016-06-02 13:12:28 +02:00
Alexander Bock
0508faf7ce
Some changes to make GUI optional
2016-06-01 23:15:02 +02:00
Alexander Bock
a2cad36772
Merge remote-tracking branch 'origin/feature/iSWA' into develop
...
Conflicts:
data/scene/default.scene
scripts/bind_keys.lua
2016-06-01 19:46:23 +02:00
Alexander Bock
00d8445825
Increase the Syncbuffer to deal with larger scripts
2016-05-30 12:26:06 +02:00
Sebastian Piwell
a28abd7774
iSWA Screen Space Options
2016-05-12 15:10:17 -04:00
Sebastian Piwell
e51b104ce8
Transformation Manager
2016-05-10 11:18:09 -04:00
Sebastian Piwell
39ff2415bb
Name changes
2016-05-09 13:09:47 -04:00
Michael Nilsson
0d49076c54
solve merge conflict with develop
2016-05-03 17:11:28 -04:00
Michael Nilsson
f05672436e
removed iswamanager update function and create cygnet through scripts instead
2016-05-03 15:07:22 -04:00
Sebastian Piwell
dfd1968f0b
Lua script to add cygnet
2016-05-03 13:24:17 -04:00
Alexander Bock
20532d704f
Rename Lua functions to preInitialization and postInitialization
...
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
Alexander Bock
75175512a8
First implementation of moving the startup scripts into the scene description files
2016-04-27 16:46:31 +02:00
Michael Nilsson
c72536fbbc
untabify to make merge easier
2016-04-20 15:21:30 -04:00
Alexander Bock
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
6c6555bbce
Print out the number of warnings, errors, and fatal errors that happened during initialization and each frame after
...
Updated to new Ghoul version
2016-04-18 16:44:44 +02:00
Alexander Bock
f0748505b7
Include VisualStudioOutputLog
...
Correctly allow '/' character in SceneGraph description files
2016-04-18 15:12:40 +02:00
Alexander Bock
cf517f5309
Replacing CMake-based version setting with C++-based version
...
Adding function to OpenSpace that returns the license header
2016-04-14 10:27:59 -04:00
Alexander Bock
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
Alexander Bock
598409c4d1
Fix for crash from double deinitialization
2016-02-22 21:41:35 +01:00
Emil Axelsson
73cf15beb6
- Add currentDrawBufferResolution method in WindowWrapper
...
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
eight samples
2016-02-09 10:46:51 +01:00
Alexander Bock
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
Emil Axelsson
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
Emil Axelsson
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
Alexander Bock
85d564767b
Fix #define None include error on X11 systems
2016-01-18 18:05:57 +01:00
Alexander Bock
aee6146d3f
Xlib compile error
2016-01-18 17:52:14 +01:00
Alexander Bock
c87fdfd38b
Fixes for Windows
...
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
Alexander Bock
0735d0fc2d
More cleanup of FactoryManager
2015-12-14 17:55:24 -08:00
Alexander Bock
177571195c
Completely remove references to constants.h
2015-12-14 17:36:15 -08:00
Alexander Bock
c99666e75a
Cleaning ConfigurationManager and OpenSpaceEngine
...
Updated Ghoul version
2015-12-14 16:44:13 -08:00
Alexander Bock
adfc7d244c
Cleanup of WindowWrapper classes
2015-12-14 15:55:28 -08:00
Alexander Bock
6eca5c0f68
More module cleanup
2015-12-14 11:46:44 -08:00
Alexander Bock
2fce471743
Started cleanup of module structure
2015-12-14 10:50:38 -08:00
Alexander Bock
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
8260f5701d
Updated Ghoul
...
Adapted to Ghoul API change
2015-12-12 13:29:09 -05:00
Alexander Bock
ae55078ff8
Updated Ghoul version
...
Adapted to changed Ghoul API
Reenable fading of ScreenLog messages
2015-12-11 16:50:21 -05:00
Alexander Bock
e5a3a7a80b
Updating Ghoul version
...
Adapting OpenSpaceEngine to new Ghoul API
2015-12-09 19:10:59 -05:00
Alexander Bock
0006e83f4b
Updated Ghoul
...
Adapted to cleanup in Ghoul
2015-11-30 17:50:26 -05:00
Alexander Bock
94663e7bf7
Updated Ghoul version
2015-11-23 12:03:08 -05:00
Alexander Bock
01c1586616
Updated OpenSpace's requirement to C++14
...
Adopted changes from Ghoul cleanup
2015-11-22 02:53:44 -05:00
Alexander Bock
fad2c642f8
Cleanup of SpiceManager by introducing exceptions
...
Catch exceptions in RenderableShadowCylinder and LabelParser
Catch exceptions in RenderableFov and Hongkangparser
2015-11-18 21:55:25 -05:00
Alexander Bock
f7f5f2e262
Started cleanup of SpiceManager
...
Clean boost message output
Update to new Ghoul with cppformat library
2015-11-17 23:54:54 -05:00
Alexander Bock
2cf7dfb27d
Changed RenderEngine to use Ghoul fontrendering instead of SGCT
2015-11-16 19:21:05 -05:00
Alexander Bock
a7807e5581
Updated Ghoul version
2015-11-13 18:18:42 -05:00
Alexander Bock
177ec6d568
Apply new changes to Fontrendering
2015-11-11 00:32:30 -05:00
Alexander Bock
c61d1cc861
Use correct window parameter for font rendering
2015-11-03 20:53:01 -05:00
Alexander Bock
bbb622f555
Initial work on integrating fontrendering into ghoul
2015-11-02 21:40:45 -05:00
Alexander Bock
390f5be4a8
Removing includes of sgct.h
2015-10-26 16:14:38 -05:00
Alexander Bock
20861d68ad
Changing WindowWrapper from pointer to reference
2015-10-26 15:10:15 -05:00
Alexander Bock
f3fd055db8
Rename WindowHandler to WindowWrapper
2015-10-26 15:00:46 -05:00
