Michael Nilsson
f2b802b317
MemoryFile har now char pointer and size instead of string
2016-05-06 16:39:24 -04:00
Michael Nilsson
d63dd7db44
remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile
2016-05-06 15:56:12 -04:00
Michael Nilsson
cbd6fd9234
iswacygnets now use new download funtions aswell
2016-05-06 15:09:09 -04:00
Michael Nilsson
47e2abf87d
new download function using std::future and std::async
2016-05-06 10:48:27 -04:00
Michael Nilsson
d0e6c8dd6e
removed progresscallback from downloadToMemory
2016-05-05 11:07:00 -04:00
Michael Nilsson
0d49076c54
solve merge conflict with develop
2016-05-03 17:11:28 -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
Sebastian Piwell
f13367e717
Kameleon plane
2016-04-25 10:37:06 -04:00
Sebastian Piwell
0246cd482e
Solved merge conflict
2016-04-22 20:01:15 -04:00
Sebastian Piwell
f6bbce8b4c
Add extension to futurefile
2016-04-22 17:39:45 -04:00
Michael Nilsson
c72536fbbc
untabify to make merge easier
2016-04-20 15:21:30 -04:00
Michael Nilsson
07dfafeddb
solve merge conflict with develop
2016-04-20 15:03:51 -04:00
Michael Nilsson
a068ca2030
load cygnets through mod file
2016-04-20 09:47:20 -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
a21c9538b6
Untabify more files
2016-04-18 15:15:30 +02:00
Sebastian Piwell
bf61f6f1e4
Load and read textures from memory
2016-04-06 14:17:29 -04:00
Michael Nilsson
49d8319938
merge with develop
2016-04-05 12:02:25 -04:00
Michael Nilsson
0d0f761d6e
downloadmanager return shared_ptr to FileFutures instead of bare pointers
2016-04-05 11:33:58 -04:00
Michael Nilsson
f4964b1628
request file extension
2016-04-01 16:32:18 -04:00
Michael Nilsson
5911149273
downloadmanager load to string. update texture function to renderabletextureplane
2016-03-23 16:57:25 -04: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
Alexander Bock
465715f652
Remove DummyWindowWrapper and implement default methods into WindowWrapper
2015-12-23 16:26:24 -05:00
Alexander Bock
c92fc923f9
Remove constants.h file
...
Reenable LuaConsole rendering
2015-12-14 17:21:22 -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
0006e83f4b
Updated Ghoul
...
Adapted to cleanup in Ghoul
2015-11-30 17:50:26 -05:00
Alexander Bock
bbb622f555
Initial work on integrating fontrendering into ghoul
2015-11-02 21:40:45 -05:00
Alexander Bock
1149a0d380
Compile fix for unit test cases where no windowwrapper is needed
2015-10-27 15:03:46 -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
Alexander Bock
77857975a4
Changing the RenderEngine to use the SGCT window wrapper
2015-10-26 11:44:16 -05:00
Alexander Bock
062817b7fb
More work moving code to window wrapper
...
Removing capability to show SGCT rendering information
2015-10-26 11:20:48 -05:00
Alexander Bock
49dbb1ce20
More work on converting to SGCT window handler
...
Adapting to change in SGCT key callback handling
2015-10-26 09:19:28 -05:00
Alexander Bock
d84edc4090
More work on transitioning to windowwrapper for keyboard and mouse interaction
2015-10-25 17:34:03 -05:00
Alexander Bock
5456b5ee85
Started change moving from explicit SGCT functions to wrapper class
2015-10-25 13:50:39 -05:00
Alexander Bock
f8f48acb98
Implementation of the windowhandler interface
2015-10-20 23:30:40 +02:00
Alexander Bock
678362eee2
Add a global propertyowner namespace to which the InteractionHandler is added, removing the need for the earlier hack
2015-07-06 15:55:42 +02:00
Joakim Kilby
2188fc1809
Merge branch 'develop' into feature/remote
...
* develop: (72 commits)
Disable blackout on startup
Fixed path bug
Remove the rendering method override
Fix crash that happens when SpiceManager is deinitialized
Adding convenient scripts for showing 67P and changing coordinate system to 67P
Adding hybrid read method for Pluto Cleanups + logical changes to parsing and sequencing
Adding the possibility to project to arbitrary bodies model files
Adding support for imageplanes for multiple instruments
Fixing bug in model magnification
Made destination optional in data specifications
Renamed OpenSpaceModule's initialize method to create Created new initialize method that gets called in OpenSpaceEngine initialize
Remove setName function from OpenSpaceModule and move naming into constructor
Always build libtorrent as a static library
Set Launcher as default application Don't copy curl.dll on non-windows system
Correct CURL cmake specification
Add the FindCurl module from CMake into the support directory
Fix method renaming error in volume module
Updated data folder reference
Make SpiceManager derive from Singleton
Allow left-aligned and right-aligned messages in Launcher
...
Conflicts:
modules/kameleon/CMakeLists.txt
openspace.cfg
src/engine/openspaceengine.cpp
2015-07-01 14:38:33 +02:00
Joakim Kilby
13eb012a04
added a current run time variable for the openspace engine + get/set method.
...
run time is set in preSync from SGCT runtime at the moment
2015-06-24 17:51:32 +02:00
Joakim Kilby
9a74bd60b7
renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.
...
started rebase work on parallel connection
2015-06-24 11:23:36 +02:00
Alexander Bock
5227ce2213
Renamed OpenSpaceModule's initialize method to create
...
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
Alexander Bock
4d6663f824
Add a time-remaining counter to Launcher
2015-06-18 22:46:24 +02:00
Alexander Bock
f58d6d91b5
Enable setting the capabilities verbosity using the configuration file
2015-06-18 14:29:34 +02:00
Alexander Bock
54186e5dcb
Fix layout issues
2015-06-17 01:43:01 +02:00
