mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-11 14:14:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
535 Commits 83 Branches 46 Tags
aba4d6024d3c7d6969fc194bc3c819e07bd90d37
Commit Graph

99 Commits

Author SHA1 Message Date
Alexander Bock
aba4d6024d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 15:42:51 +01:00
Alexander Bock
f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +01:00
Jonas Strandstedt
fc6fbf1587 Fix for multi node rendering in release mode 
- Working but maybe temporary fix checking that the SyncBuffer object is
  not nullptr.
- Might need changing from heap to stack allocated object
  instead.
 2014-12-03 13:18:04 +01:00
Alexander Bock
0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +01:00
Jonas Strandstedt
69ce7c9e00 Fix LuaConsole history issues 
- Fix bug when adding command when history is empty
- Fixed loading of history from file
 2014-12-02 11:48:15 +01:00
Alexander Bock
b05c4cf30f Add capabilities to write out documentation of all Lua functions on startup 2014-11-29 14:03:49 +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
2485b12738 Fix a crash with double deinitialization 2014-11-18 16:07:59 +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
f85e18dc18 OS X now doesn't crash for volumes 
- Fixed a few warnings
 2014-11-05 17:11:27 +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
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
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
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
8b8fd08cbb Merge branch 'bug/abuffershadersupdater' into develop 2014-10-21 16:04:11 +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
jonasstrandstedt
3f72adc854 Added copy/paste for Linux 
- Requires xclip installed (otherwise nothing happens)
 2014-10-20 22:13:59 +02: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
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
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
Alexander Bock
8884f4cc36 Started initial performance testing on Lua-based keyboard controller 2014-10-13 17:24:11 +02:00
Alexander Bock
0518e8cf02 Added fixed key mapping to KeyboardControl fixed 
Cleanup of code
 2014-10-13 10:29:04 +02:00
Alexander Bock
ff62c06320 Installed new InteractionHandler 2014-10-13 00:39:46 +02:00
Alexander Bock
d67c9ffe8d Started changes for InteractionManager 2014-10-12 23:51:33 +02:00
Alexander Bock
b50a11297c Started cleanup of OpenSpaceEngine 2014-10-12 17:58:39 +02:00
Alexander Bock
c226e9b82f Cleaned up code 
Added new COMMON_FOLDER setting in scene file
Error handling when spice kernels are not available
 2014-10-11 13:40:52 +02:00
michal
3bb9912356 latest changes involve adding an unfinished class called "renderable fov"- ignore that one. 
The rest is pretty straight forward, renderable trail is the ephemeris class and wavefrontobject is a very crudely constructed reader... ill fix that on monday
 2014-10-11 01:43:31 -04:00
Jonas Strandstedt
9a1b59a73e Intermediate commit 2014-10-10 11:29:16 +02:00
michal
1ed4b74d3e added renderablepath and made changes to renderabletrail 2014-10-08 16:15:37 -04:00
michal
21745b91a5 new class - renderabletrail - will later be renamed and current replace renderableephemeris. 
Right now just adding a bunch of mod files, i know this is rather ugly but i just need it to work for friday.
 2014-10-07 18:44:14 -04:00
Alexander Bock
67f0fb3c08 Merge branch 'develop' into solarsystem2 
Conflicts:
	.gitignore
	include/openspace/util/spicemanager.h
	shaders/star_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
 2014-10-06 22:22:30 +02:00
michal
acc8056455 added some new classes for ephemeris rendering.. 2014-10-06 15:30:13 -04:00
Alexander Bock
b7da50b3dd Added Lua method to print a screenshot 2014-10-05 17:31:47 +02:00
michal
59161e186c Renderableehpemeris still as it is, will be repurposed though. 
Renderable trail now acts like planet ephemeris, not yet finished. Need to work on objectloader
 2014-10-03 18:56:16 -04:00
Jonas Strandstedt
e4a8e87098 Using new ghoul ProgramObject functionality 
- Fixed risk of memory leak in SceneGraph (deleting shaders)
 2014-10-01 15:30:39 +02:00
Jonas Strandstedt
cc3f9ef34b Fixed ABuffer to update shader when Scengraph is updated 2014-09-29 13:03:58 +02:00
Alexander Bock
e6ab0f51fc Started cleanup of SpiceManager 2014-09-28 02:28:14 +02:00
Alexander Bock
b667a4910c Reworked how SPICE kernels are loaded 
- SpiceEphemeris can provide a list of kernels that are loaded when created
- Time and Leapsecond kernels are provided in the openspace.cfg file
 2014-09-28 00:06:53 +02:00
Alexander Bock
1b3823d88c Remove old Spice wrapper 2014-09-27 21:46:24 +02:00
Alexander Bock
f3fb8cd95e Apply getValueSafe/getValue change of Dictionary to the codebase 2014-09-27 19:23:24 +02:00