Commit Graph

480 Commits

Author SHA1 Message Date
Jonas Strandstedt 7e1396a8ae Added separete ProgressBar class 2014-11-07 14:48:03 +01:00
Jonas Strandstedt 3a2754fac7 Added support for more volume types
TODO:
- Test new type of volumes
2014-11-06 16:03:08 +01:00
jonasstrandstedt f3225418b6 Linux fixes 2014-11-06 10:08:53 +01:00
Jonas Strandstedt f85e18dc18 OS X now doesn't crash for volumes
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
Jonas Strandstedt 673e0014be Link with new Ghoul, removed CMake warning for OSX 2014-11-05 15:21:03 +01:00
Jonas Strandstedt 1b6ad0f8d7 Faster more dynamic shader loading 2014-11-04 18:17:15 +01:00
Jonas Strandstedt a96e32badb Working OS X version 2014-10-31 15:37:03 +01:00
Jonas Strandstedt 83bebbd60f First OS X ABuffer implementation
- Not working.
2014-10-30 17:10:00 +01:00
Jonas Strandstedt 51a5728716 Merge branch 'cleanup' of openspace.itn.liu.se:/openspace into cleanup 2014-10-30 11:18:32 +01:00
Jonas Strandstedt 43929810cf Pointing to ghoul master 2014-10-30 11:18:09 +01:00
jonasstrandstedt d85cb7bee3 Merge branch 'cleanup' of openspace.itn.liu.se:/openspace into cleanup 2014-10-30 09:21:07 +01:00
jonasstrandstedt 6193af0e33 Added MD5 check support for downloaded files
- Pointing to Linux fixed Ghoul
2014-10-30 09:18:57 +01:00
Jonas Strandstedt 98152b8da9 Removed OpenCL dependencies 2014-10-29 17:54:03 +01:00
Jonas Strandstedt 619d71ae23 Pointing to latest Ghoul 2014-10-29 17:05:49 +01:00
Jonas Strandstedt 7af4e11597 Pointing to latest Ghoul 2014-10-29 16:25:24 +01:00
Jonas Strandstedt 9c171d9ff8 Fix Release build issues 2014-10-29 14:03:41 +01:00
Jonas Strandstedt f2d443eb0e Merge branch 'cleanup' of openspace.itn.liu.se:/openspace into cleanup 2014-10-29 10:54:29 +01:00
Jonas Strandstedt a151c24904 Small changes to CMake downloader 2014-10-29 10:54:06 +01:00
michal a62f8471a0 Merge branch 'cleanup' of openspace.itn.liu.se:/openspace into cleanup 2014-10-28 12:12:00 -04:00
michal 1d67e1ca22 minor changes to renderable path. still in debug. 2014-10-28 12:11:41 -04:00
Jonas Strandstedt ea40afd715 Merge branch 'cleanup' of openspace.itn.liu.se:/openspace into cleanup 2014-10-28 16:30:50 +01:00
Jonas Strandstedt 81d9039cdb Added file fetching in CMake for large files 2014-10-28 16:29:29 +01:00
michal 37e9dcafa4 git complains i should push data. ill do that. 2014-10-28 10:37:58 -04:00
jonasstrandstedt 963d260ca0 Pointing to ghoul master 2014-10-28 11:04:12 +01:00
jonasstrandstedt 22c05426f5 Linux bug fix 2014-10-28 09:19:14 +01:00
Jonas Strandstedt 15db56ff33 Removed unused file 2014-10-27 19:10:09 +01:00
Jonas Strandstedt 4bb9d8c800 Merge branch 'solarsystem2' into cleanup
Conflicts:
	src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt 20137613a8 Fixed Visual Studio assert error
- Visual studio optimized away the assert expression causing the getvalue
  statement not to be called
2014-10-27 18:01:46 +01:00
Jonas Strandstedt 5daa77f7b2 Fixed Release build for windows
- Release build is booting but something goes wrong with spice
2014-10-27 15:22:14 +01:00
michal 51c8034fe9 boresight works. 2014-10-24 21:45:49 -04:00
Jonas Strandstedt ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
Jonas Strandstedt ed3063ab86 Continue fixing warnings 2014-10-24 11:18:36 +02:00
jonasstrandstedt 1bf256db5a Fix warnings 2014-10-24 08:46:31 +02:00
michal d3ea503454 Fixes to the modelloader class 2014-10-23 20:11:49 -04:00
michal 1e3a7a72f1 openspace-data 2014-10-23 18:49:54 -04:00
michal ecfc4ad79a reshaping the modelloader class to suit the overall design of openspace 2014-10-23 18:49:15 -04:00
Jonas Strandstedt 5225323a2b Cleaning up OpenSpaceEngine and RenderEngine 2014-10-23 18:13:40 +02:00
michal 08a97d9e68 Merge branch 'develop' into solarsystem2
Conflicts:
	scripts/default_startup.lua
	src/rendering/renderablewavefrontobject.cpp
2014-10-23 11:45:24 -04:00
michal 2dab6e41d5 begin merge with develop 2014-10-23 11:37:22 -04:00
Jonas Strandstedt 9b1c993e89 Removed SGCT include from openspaceengine.h 2014-10-23 16:08:10 +02:00
Jonas Strandstedt 3ee8f85c14 Removed Flare 2014-10-23 15:35:55 +02:00
Jonas Strandstedt 5e410c6816 Removed unused files 2014-10-23 14:35:04 +02:00
michal 5ece54cdc0 openspace-data issue in sourcetree, pushing 2014-10-22 16:09:05 -04:00
michal 3a8b2ac4a2 smallchanges 2014-10-22 15:19:15 -04:00
Jonas Strandstedt a7da4d84cc Added SyncBuffer class
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00
Jonas Strandstedt a8f3923659 Moved the lua command input to separete class
- Added functionality for keeping the input history
2014-10-22 13:04:55 +02:00
jonasstrandstedt 490fbc4869 Linux fix 2014-10-21 21:44:29 +02:00
michal bd802c261f ghoul submodule stuff 2014-10-21 13:44:44 -04:00
michal 64ee84ede1 Fixed model oriantation
After 32 maya exports and about 600 different attempts of different rotations / scalings along each axis
I realised that the model is in fact correctly aligned and that what we are seing are precisional errors with the
stupid boresight-polygon-baton.

Nevertheless, out of all of those Im keeping some of the more cruicial test-objects (8 to be precise) for future reference,
these can be deleted at some point, I just really want to keep them for now, comfort blanket.
2014-10-21 12:49:39 -04:00
Jonas Strandstedt 0e52e759db Improved interaction for distance and origin 2014-10-21 17:04:58 +02:00