mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 04:19:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,859 Commits 86 Branches 46 Tags
b8b2867a207bdfd520aed7d366dc64bd50ee1185
Commit Graph

2299 Commits

Author SHA1 Message Date
michal
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
Hans-Christian Helltegen
337ce2dd92 Added support for rendering fieldlines as textured view-aligned billboards 2014-11-24 17:18:55 +01:00
Hans-Christian Helltegen
815fc3b348 Fixed depth, position, scale and shader issues with fieldlines. Added passthrough geometry shader 2014-11-21 10:37:01 +01:00
jonasstrandstedt
561aa221d3 Linux fixes 
- Commented out the tinythread hack from src/CMakeLists.txt
 2014-11-20 09:33:07 +01:00
Alexander Bock
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
Alexander Bock
432266ee6a Allow access to the console through OpenSpaceEngine 
Enable scripting for showing/hiding the console
 2014-11-18 19:39:25 +01:00
Alexander Bock
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
Alexander Bock
f02234099f Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file 2014-11-18 17:17:56 +01:00
Alexander Bock
a0503ba957 Modularizing font specification 2014-11-18 16:21:52 +01:00
Alexander Bock
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
Jonas Strandstedt
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
michal
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
michal
5d1b0c694a some cleanup. 2014-11-13 11:35:17 -05:00
Jonas Strandstedt
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
michal
d6d7f1ffe7 intermediate commit. 2014-11-12 12:28:16 -05:00
Jonas Strandstedt
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
Jonas Strandstedt
46959b4801 Cleanup for KameleonWrapper 
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
 2014-11-11 13:43:38 +01:00
michal
0803b1cacf Minor changes for targeting. 2014-11-10 13:00:04 -05:00
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
michal
2426d62677 Added target-switch method based on object visibility, will need refinement. 2014-11-05 19:26:11 -05:00
Jonas Strandstedt
f85e18dc18 OS X now doesn't crash for volumes 
- Fixed a few warnings
 2014-11-05 17:11:27 +01:00
michal
3e934b4f8a Working Field of View Rendering. 
TODO:
Optimization and stuff.
 2014-11-04 18:12:52 -05:00
michal
f0b6b17554 semi-working fov. 2014-11-03 22:35:04 -05:00
michal
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
michal
e31a0b70ab RenderableFov class. 
Intersections with planet and instrument FOV boundary vectors / boresight seem to be correct with a margin of error. This could be either due to
precision issues experienced at greater distances, light-time or stellar aberration correction methods, planetary radius etc etc.
 2014-10-27 21:35:59 -04: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
ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
michal
d3ea503454 Fixes to the modelloader class 2014-10-23 20:11:49 -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
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
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
Jonas Strandstedt
0e52e759db Improved interaction for distance and origin 2014-10-21 17:04:58 +02:00
Jonas Strandstedt
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
michal
54809c6376 Pluto geometry artefacts commit. 2014-10-20 18:29:55 -04:00
michal
50b4c1ec36 fixed renderabletrail class to suit for all different delta times, tropical orbits etc etc. lot of stuff to do with precision and set time intervals (pain in the ass). works clockwork. 
changes to modules etc. will do more fixes soon. Incoming.
 2014-10-20 16:00:38 -04:00
Jonas Strandstedt
5cd90db239 Added seconds version of the command input 
- Using unix terminal style input history
- ctrl+c support to copy current command to clipboard
- ctrl+v support to paste current text from clipboard
 2014-10-20 17:12:53 +02:00
Jonas Strandstedt
dbef0d36e4 Initial command input support 
- Access the command input prompt with  the § button on swedish keyboard
  layout. It is whatever key is corresponding to SGCT_KEY_BACKSLASH on
  other layouts.
 2014-10-20 15:58:37 +02:00
Jonas Strandstedt
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
Jonas Strandstedt
18a87ef99e Added ScreenLog 
- Added first version of a ScreenLog mechanism
- Moved the info box to the upper left corner
- Added Ubuntu fonts
- Made RenderEngine a PropertyOwner with _showInfo and _showScreenLog as
  bool properties that can be edited through Lua.
 2014-10-17 12:20:23 +02:00
michal
099bcc2c9b changing renderabletrail class to work for planetocentric 2014-10-16 16:13:54 -04:00
Jonas Strandstedt
572651dba7 Added cotire to speed up compilation 2014-10-16 15:38:59 +02:00
Alexander Bock
86efb3573b More work in preparing for lua-based keyboard controller 
Modified ScriptManager to decouple adding libraries from registering libraries
Allowing ScriptManager to register libraries to other lua states as well
 2014-10-14 00:08:26 +02:00