mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-04 03:18:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
680 Commits 84 Branches 46 Tags
25ca99799b6adade673d885efc5b223dbc7b77ca
Commit Graph

680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Marcinkowski
25ca99799b Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2 2014-12-22 10:03:10 -05:00
Michal Marcinkowski
ee306cf54c Added separate shader for write to texture, relies on blend logic. 2014-12-22 10:02:31 -05:00
Alexander Bock
b131aa5745 Move the Ghoul repository to GitHub 2014-12-20 00:28:18 +01:00
Michal Marcinkowski
b14ff04f76 wip - piping projection-to-texture to GPU. 2014-12-18 12:00:27 -05:00
Michal Marcinkowski
647416b3a7 updata data 2014-12-15 16:24:25 -05:00
Michal Marcinkowski
70569cba7f fixes to restore to stage prior purge 2014-12-15 16:24:04 -05:00
Michal Marcinkowski
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
Michal Marcinkowski
edf709cf1b local changes update databranch 2014-12-15 13:21:07 -05:00
Alexander Bock
5dac3926a1 Apply Ghoul changes 2014-12-14 02:33:50 +01:00
Alexander Bock
9dea69d675 Empty commit to get a new HEAD 2014-12-12 23:16:55 +01:00
Alexander Bock
66cb7b18e8 Removing old diff file 2014-12-12 23:15:58 +01:00
Alexander Bock
6a6c059e1f removing spice source files in preparation for the big purge 2014-12-12 23:02:48 +01:00
Alexander Bock
38aacc05a7 removing spice source files in preparation for the big purge 2014-12-12 23:01:20 +01:00
Michal Marcinkowski
70d24185de intermediate commit prior to merge 2014-12-12 11:52:31 -05:00
Jonas Strandstedt
eb7488318a Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-12 14:55:48 +01:00
Jonas Strandstedt
56e3851b8f Renamed CPUCapabilitiesComponent to GeneralCapabilitiesComponent 2014-12-12 14:55:16 +01:00
Alexander Bock
6360a5f66a Add methods for generating Property descriptions 2014-12-12 14:47:08 +01:00
Alexander Bock
efab84b4ba Add default description for Properties 
Remove accidental commit
 2014-12-12 14:23:33 +01:00
Alexander Bock
ef30925a5b Make the default window completely show on default 2014-12-12 14:22:05 +01:00
Jonas Strandstedt
5c666a0175 Further work on removing assertions from constructors 2014-12-12 11:46:10 +01:00
Jonas Strandstedt
93a34fa985 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-12 11:00:26 +01:00
Jonas Strandstedt
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
Alexander Bock
119b1eb335 Started work to produce descriptive output for Properties in preparation for GUI generation 2014-12-11 23:41:31 +01:00
Alexander Bock
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
Jonas Strandstedt
9e61d3ac94 Fixes for RenderableFov 2014-12-11 17:16:41 +01:00
Jonas Strandstedt
da4fa44c03 Continued work on memory leaks and proper isReady usage 2014-12-11 16:48:49 +01:00
Jonas Strandstedt
dc21196f70 Removed RenderableEphemeris 2014-12-11 16:45:02 +01:00
Jonas Strandstedt
122aec83b1 Windows fix after memory leak fixes 2014-12-11 14:12:01 +01:00
jonasstrandstedt
7b2b81ed54 Fix memory leaks and proper deinitialization 2014-12-11 10:13:10 +01:00
jonasstrandstedt
01361307f6 Update ghoul reference 
- Added destructor to OpenSpaceEngine to deallocate SyncBuffer
- Changed texture reading to avoid memory leak
 2014-12-10 20:57:41 +01:00
jonasstrandstedt
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
jonasstrandstedt
179f6edd9d Added warning for SceneGraphNodes that were not loaded 2014-12-10 15:38:22 +01:00
jonasstrandstedt
302e642c1c Dependency system for OpenSpace Modules 
When loading the SceneGraph for the first time all modules are loaded
into a map and the parent dependency to another map. After all modules
and ScenegraphNodes have been loaded into the map, each module is loaded
in dependency order starting from the root node.
 2014-12-10 14:35:08 +01:00
jonasstrandstedt
6c870e47d7 Fixed path for LogFactory 2014-12-10 13:06:00 +01:00
Alexander Bock
81c930461f Only do cotire on non-linux systems (as Jenkins complains) 2014-12-10 01:24:33 +01:00
Alexander Bock
967ecfeb79 Enable cotire on default 2014-12-10 01:18:24 +01:00
Alexander Bock
3ff33ad209 Update openspace-data reference 2014-12-10 00:59:56 +01:00
Alexander Bock
2883eaf254 Enable Gui integration of SelectionPropertys 2014-12-10 00:55:51 +01:00
Alexander Bock
c3bb233d29 Moved shadercode of constellationbounds 2014-12-10 00:27:35 +01:00
Alexander Bock
6d4ac1fe49 Add a new include path to the base shader folder 
Move the RenderableStars shaders into a separate folder
 2014-12-10 00:22:41 +01:00
Michal Marcinkowski
6ef0181148 Merge branch 'develop' into solarsystem2 
Conflicts:
	include/openspace/util/spicemanager.h
 2014-12-09 18:04:38 -05:00
Michal Marcinkowski
1a9c726f58 intermediate commit before merge 2014-12-09 17:50:29 -05:00
Alexander Bock
fe73550b55 Add a TriggerProperty that fires a single event when a value is passed 2014-12-09 23:31:05 +01:00
Michal Marcinkowski
759756ccb4 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/properties/optionproperty.cpp
 2014-12-09 14:12:13 -05:00
Michal Marcinkowski
890c4f3091 intermediate commit 2014-12-09 14:09:49 -05:00
Michal Marcinkowski
fd014cd519 minor changes, intermediate commit / restore point 2014-12-09 14:09:24 -05:00
Alexander Bock
f201d4a622 Fix return-value-optimization errors 2014-12-09 19:39:16 +01:00
Alexander Bock
7226b23cc0 Fixing doxygen warnings 2014-12-09 19:11:49 +01:00
Alexander Bock
82c42cb97a General code cleanup 2014-12-09 18:36:23 +01:00
Alexander Bock
61ec72d9a0 Merge branch 'feature/performancemeasuring' into develop 2014-12-09 16:13:54 +01:00