6a6c059e1f
removing spice source files in preparation for the big purge
2014-12-12 23:02:48 +01:00
bd841c488c
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/scenegraph/scenegraph.cpp
src/util/factorymanager.cpp
2014-12-08 21:26:38 -05:00
b40ec16f1c
intermediate commit
2014-12-08 20:44:58 -05:00
d8f7bb746a
Started cleaning OpenSpaceEngine
2014-12-08 18:30:18 +01:00
ad9ba2404d
Merge branch 'gui' into develop
2014-12-08 12:58:32 +01:00
e72515ab77
Update ghoul version
2014-12-08 12:50:12 +01:00
0854aa5bcb
Added imgui library
2014-12-06 12:48:56 +01:00
d4072a7002
Updating Ghoul version
2014-12-06 01:30:03 +01:00
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
d3e16a0437
Apply changes to texture reading
2014-12-05 21:01:54 +01:00
645da3630f
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-12-05 16:52:53 +01:00
5e94004a01
Removed Spice source submodule and added precompiled libraries
2014-12-05 16:52:13 +01:00
cf53b5c1b0
Let the LuaConsole use a permanent cached file for the history
2014-12-05 16:43:16 +01:00
11e867aaf1
Fixed bug that causes crash if Focus node wasn't found
2014-12-04 23:27:18 +01:00
0d48766f7d
Move the cmake include files from ext to support/cmake
2014-12-04 16:30:16 +01:00
b2cb6fb584
Change some more code in preparation of the new SGCT version
2014-12-04 16:28:49 +01:00
ba4a55fd88
Removed references to OpenCL
2014-12-04 14:36:55 +01:00
4ff9f08473
Changes to conform to new ghoul ProgramObject::Build interface
2014-12-03 16:30:25 +01:00
0dc2a9d030
Allow the configuration file to request logging functionality
2014-12-03 00:39:42 +01:00
eb6641a87b
Updated Spice reference
...
Updated Ghoul reference
Added possible check-point for dome mismatch in rendering
2014-12-02 23:12:10 +01:00
f0722700cf
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/scenegraph/scenegraph.cpp
2014-12-02 11:19:51 +01:00
82491bf89b
More work on cleaning up / extending RenderableStars
2014-11-27 23:42:32 +01:00
b9868987a2
intermediate commit
2014-11-26 12:12:03 -05:00
c154141b8b
minor changes, testing
2014-11-26 11:22:11 -05:00
fc1dcfabc8
Some more changes to the RenderableStars class
2014-11-26 16:36:02 +01:00
b4f6070642
Started cleanup of RenderableStars class
2014-11-25 19:15:59 +01:00
4069680662
Point to Ghoul master
2014-11-18 08:40:44 +01:00
31c76f3e3c
Added key binding from Lua possible
...
- Possible to add key bindings from Lua possible. This calls Lua scripts
from key commands.
- Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +01:00
7e1396a8ae
Added separete ProgressBar class
2014-11-07 14:48:03 +01:00
f3225418b6
Linux fixes
2014-11-06 10:08:53 +01:00
673e0014be
Link with new Ghoul, removed CMake warning for OSX
2014-11-05 15:21:03 +01:00
1b6ad0f8d7
Faster more dynamic shader loading
2014-11-04 18:17:15 +01:00
79b75aa572
field of view rendering. Intermediate commit.
...
Working on trying to get the fov-on-surface square to render.
2014-11-01 18:41:09 -04:00
a96e32badb
Working OS X version
2014-10-31 15:37:03 +01:00
83bebbd60f
First OS X ABuffer implementation
...
- Not working.
2014-10-30 17:10:00 +01:00
43929810cf
Pointing to ghoul master
2014-10-30 11:18:09 +01:00
98152b8da9
Removed OpenCL dependencies
2014-10-29 17:54:03 +01:00
619d71ae23
Pointing to latest Ghoul
2014-10-29 17:05:49 +01:00
7af4e11597
Pointing to latest Ghoul
2014-10-29 16:25:24 +01:00
9c171d9ff8
Fix Release build issues
2014-10-29 14:03:41 +01:00
a151c24904
Small changes to CMake downloader
2014-10-29 10:54:06 +01:00
37e9dcafa4
git complains i should push data. ill do that.
2014-10-28 10:37:58 -04:00
963d260ca0
Pointing to ghoul master
2014-10-28 11:04:12 +01:00
5225323a2b
Cleaning up OpenSpaceEngine and RenderEngine
2014-10-23 18:13:40 +02:00
9b1c993e89
Removed SGCT include from openspaceengine.h
2014-10-23 16:08:10 +02:00
490fbc4869
Linux fix
2014-10-21 21:44:29 +02:00
db141e8e86
Merge branch 'develop' into bug/abuffershadersupdater
...
Conflicts:
ext/ghoul
openspace.cfg
src/abuffer/abuffer.cpp
src/engine/openspaceengine.cpp
src/rendering/renderengine.cpp
2014-10-21 14:54:48 +02:00
7ef5295bb7
Added ABuffer reinitialization
...
- Fixed so ABuffer reinitializes properly (could probably be optimized by
not resizing of smaller than before)
- Now setting size properly from window dimensions
- SGCT side-by-side stereo working
2014-10-17 14:50:40 +02:00
572651dba7
Added cotire to speed up compilation
2014-10-16 15:38:59 +02:00
befcc59bcd
Load common module automatically without the need to declare it in the scenefile
...
Drastically remove the amount of false-positive errors during runtime
2014-10-11 14:45:34 +02:00
Alexander Bock