5a7a518bad
Remove cppcheck warnings
2014-12-16 21:54:53 +01:00
70569cba7f
fixes to restore to stage prior purge
2014-12-15 16:24:04 -05:00
734ce03d72
Changed the deinitialization of renderable from the destructorto the scenegraphnode
2014-12-15 20:51:00 +01:00
f032b4e3b0
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
include/openspace/rendering/renderablefov.h
src/CMakeLists.txt
src/rendering/model/renderablemodel.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/factorymanager.cpp
2014-12-15 13:23:30 -05:00
70d24185de
intermediate commit prior to merge
2014-12-12 11:52:31 -05:00
93a34fa985
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-12-12 11:00:26 +01:00
37a59f3f09
Removed assertions from renderable constructors
...
- Removed assertions from RenderableFieldlines constructor
- Removed assertions from RenderableFov constructor, the variables wasn't
even used.
- Removed assertions from RenderablePath constructor
- Fixed missing delete[] is RenderableSphericalGrid
- Removed assertions from RenderableTrail constructor, added glDelete*
functions
- Removed assertions from RenderablevolumeGL constructor
2014-12-12 10:59:28 +01:00
e70b663dc3
Add log.html to the list of ignored files
...
Enable capability to disable on-screen info text
2014-12-11 18:09:19 +01:00
9e61d3ac94
Fixes for RenderableFov
2014-12-11 17:16:41 +01:00
da4fa44c03
Continued work on memory leaks and proper isReady usage
2014-12-11 16:48:49 +01:00
dc21196f70
Removed RenderableEphemeris
2014-12-11 16:45:02 +01:00
7b2b81ed54
Fix memory leaks and proper deinitialization
2014-12-11 10:13:10 +01:00
81caf96d72
Started working on Renderables
...
- Making sure isReady is properly set
- Making sure initialization is done correctly
- Making sure deinitialization is done correctly
2014-12-10 19:43:38 +01:00
6ef0181148
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/spicemanager.h
2014-12-09 18:04:38 -05:00
01e71f2fc0
More work on performance measuring in imgui
2014-12-09 15:49:54 +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
90eac194dc
Initial work on performance measuring
2014-12-09 01:41:42 +01:00
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
5497f25725
Added the selection property to the RenderableConstellationBounds
2014-12-04 23:05:51 +01:00
fe9db28310
Finished with current version of ConstellationBounds
2014-12-04 19:12:31 +01:00
3f35b0a948
More optimizations for RenderableConstellationBounds
2014-12-04 18:37:15 +01:00
38b1c00d3d
Fix RenderableConstellationBounds name
...
Make rendering more efficient
2014-12-04 18:05:13 +01:00
5d168c18e5
First working version
2014-12-04 00:55:25 +01:00
1a590f83e0
Initial commit of constallation bounds
2014-12-04 00:18:37 +01:00
f7b2bc12e0
Added billboard support for RenderablePlane
2014-12-03 14:48:50 +01:00
5b1b8694dc
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines
2014-12-01 16:40:01 +01:00
834612469c
Finalized the billboard rendering. Code cleanup
2014-12-01 16:27:30 +01:00
bd74acedd3
fixing stupid git mistake.
2014-11-28 17:15:13 -05:00
a5c232eb88
Tidying up.
2014-11-28 14:41:59 -05:00
83ed904f1d
changes to projective texturing, some cleanup.
2014-11-28 13:49:18 -05:00
20c96f00e8
More cleanup of RenderableStars, enable rendering of Speed variable
2014-11-28 15:57:14 +01:00
4de8071efe
Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
...
Fix velocity in RenderableStars
2014-11-28 01:41:26 +01:00
43d542293a
More work in progress on RenderableStars
...
- Made the shader a private object not instantiated by scenegraph
- Started enabling coloring by velocity
- Code cleanup
2014-11-27 03:08:40 +01:00
e8de5edb45
Have RenderableStars cache the full Speck file
...
Enable basic slicing of the data
2014-11-27 02:26:43 +01: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
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
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
337ce2dd92
Added support for rendering fieldlines as textured view-aligned billboards
2014-11-24 17:18:55 +01:00
815fc3b348
Fixed depth, position, scale and shader issues with fieldlines. Added passthrough geometry shader
2014-11-21 10:37:01 +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
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
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
Alexander Bock