bd74acedd3
fixing stupid git mistake.
2014-11-28 17:15:13 -05:00
a5c232eb88
Tidying up.
2014-11-28 14:41:59 -05:00
b9fce1f933
adding data.
2014-11-28 13:49:41 -05:00
83ed904f1d
changes to projective texturing, some cleanup.
2014-11-28 13:49:18 -05:00
0f2cf4bf72
Merge with develop
2014-11-26 13:44:26 -05:00
845469b15d
Merge branch 'develop' into solarsystem2
...
Conflicts:
openspace.cfg
shaders/generated/constants.hglsl
src/engine/openspaceengine.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/spicemanager.cpp
2014-11-26 13:42:36 -05:00
0fc0ba929b
updating some spicemanger stuff
2014-11-26 13:02:20 -05: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
fdca1c0b3b
Deinitialize scenegraph nodes when scenegraph is deinitialized
2014-11-25 19:15:33 +01:00
4c8814b237
Projective Texturing
...
Created test class based on renderableplanet & co.
Doing it this way carries some implications that need discussing.
2014-11-24 14:06:50 -05:00
561aa221d3
Linux fixes
...
- Commented out the tinythread hack from src/CMakeLists.txt
2014-11-20 09:33:07 +01:00
531bf86ddd
Added binary output directories
2014-11-19 10:53:11 +01:00
1e5c181cee
Fix adding of multiple lua libraries with the same name by allowing them to be merged internally
2014-11-18 19:41:02 +01:00
73143b8b47
Reenable methods for limiting closeness to focus object
...
Renable key binding feature that was broken by merging
2014-11-18 19:40:24 +01:00
432266ee6a
Allow access to the console through OpenSpaceEngine
...
Enable scripting for showing/hiding the console
2014-11-18 19:39:25 +01:00
e630f6efbb
Fixed bug that did not set cache directory correctly
...
Moved visibility of console into LuaConsole class
2014-11-18 17:47:09 +01:00
f02234099f
Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file
2014-11-18 17:17:56 +01:00
a0503ba957
Modularizing font specification
2014-11-18 16:21:52 +01:00
66ef5d9e3b
Update openspace-data and gitignore list
2014-11-18 16:08:51 +01:00
2485b12738
Fix a crash with double deinitialization
2014-11-18 16:07:59 +01:00
6b40cb18fb
Merge branch 'feature/interactionhandler' into develop
...
Conflicts:
include/openspace/engine/openspaceengine.h
include/openspace/interaction/interactionhandler.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
2014-11-18 15:46:26 +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
484dfefbee
Adding temporary testing class based on renderablePlanet for testing projective texturing.
...
Note: This class will most probably be removed at some point, carry on.
2014-11-13 15:00:45 -05:00
5d1b0c694a
some cleanup.
2014-11-13 11:35:17 -05:00
8d2503b68e
Added support for pixelData for ABuffer
...
- ABufferFixed should work but it doesn't. But the interface works at
least.
- ABufferFixed works for normal rendering
- Removed position for ABuffer, it should make rendering much faster.
Todo:
- Figure out why the fetching of pixelData for ABufferFixed gives wrong
result.
2014-11-13 15:41:10 +01:00
d6d7f1ffe7
intermediate commit.
2014-11-12 12:28:16 -05:00
ba7a4a4a47
Added ABuffer visualizer
...
- First draft of the ABuffer visualizer renders a cube with all fragments
from the single linked abuffer. Lua command to turn on is
openspace.visualizeABuffer(true)
- Fixed LuaConsole to stop receiving input command after inputing command
- Fixed LuaConsole not to add command to history if it is identical to the
most recent command.
TODO:
- Add support for dynamic and fixed abuffer
- Scale the cube to match the window ratio
2014-11-12 16:54:40 +01:00
890fd9c05d
Fixed fisheye rendering
2014-11-11 13:56:33 +01:00
46959b4801
Cleanup for KameleonWrapper
...
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
2014-11-11 13:43:38 +01:00
0803b1cacf
Minor changes for targeting.
2014-11-10 13:00:04 -05:00
7e1396a8ae
Added separete ProgressBar class
2014-11-07 14:48:03 +01:00
3a2754fac7
Added support for more volume types
...
TODO:
- Test new type of volumes
2014-11-06 16:03:08 +01:00
f3225418b6
Linux fixes
2014-11-06 10:08:53 +01:00
2426d62677
Added target-switch method based on object visibility, will need refinement.
2014-11-05 19:26:11 -05:00
f85e18dc18
OS X now doesn't crash for volumes
...
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
673e0014be
Link with new Ghoul, removed CMake warning for OSX
2014-11-05 15:21:03 +01:00
acec562045
data.
2014-11-04 18:13:24 -05:00
3e934b4f8a
Working Field of View Rendering.
...
TODO:
Optimization and stuff.
2014-11-04 18:12:52 -05:00
1b6ad0f8d7
Faster more dynamic shader loading
2014-11-04 18:17:15 +01:00
f0b6b17554
semi-working fov.
2014-11-03 22:35:04 -05: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
51a5728716
Merge branch 'cleanup' of openspace.itn.liu.se:/openspace into cleanup
2014-10-30 11:18:32 +01:00
43929810cf
Pointing to ghoul master
2014-10-30 11:18:09 +01:00
d85cb7bee3
Merge branch 'cleanup' of openspace.itn.liu.se:/openspace into cleanup
2014-10-30 09:21:07 +01:00
michal