Commit Graph

445 Commits

Author SHA1 Message Date
Alexander Bock b6246f6538 Renamed methods in SpiceManager
Started change of Time class
2014-09-13 18:02:39 +02:00
Alexander Bock 1101b656b8 Added missing change for the merge 2014-09-13 12:10:55 +02:00
Alexander Bock ce10dea96e Fixed compile errors, probably finished merge 2014-09-13 11:45:49 +02:00
Alexander Bock 954dbdce13 Merge branch 'origin/feature/ABuffer' into properties 2014-09-13 10:59:33 +02:00
Alexander Bock 4b8a17386f Updated ghoul version 2014-09-13 10:52:04 +02:00
Alexander Bock e13eafdbde Added more comments to main.cpp 2014-09-13 10:33:16 +02:00
Alexander Bock d659c11365 Make StringProperty a specialization rather than a subclass of TemplateProperty 2014-09-12 16:59:29 +02:00
michal c1c637efa7 minor fixes, please ref to previous commit 2014-09-10 14:35:44 -04:00
michal 686c7b0b9b final calibration + scaling fix. Looks good now. 2014-09-10 11:32:23 -04:00
michal 9c1319e298 added data 2014-09-07 16:23:12 -04:00
michal f0f3b08ab6 some cleanup 2014-09-07 16:19:13 -04:00
Alexander Bock cdfde82522 Added documentation for the PropertyDelegate class 2014-09-07 17:45:53 +02:00
Alexander Bock e5b61492e9 Fixed documentation in the inlined code of TemplateProperty as well 2014-09-07 17:20:04 +02:00
Alexander Bock 351c235312 Added documentation to TemplateProperty
Fixed bug where listeners were not notified
2014-09-07 17:11:12 +02:00
Alexander Bock 816a3a846f Removed a float vs double warning 2014-09-07 17:10:45 +02:00
Alexander Bock e16373cfcf Fixed a bug that causes the application to crash if no listener is installed for a Property 2014-09-07 17:10:33 +02:00
Alexander Bock fb24f06e5a Added doxygen files and fixed documentation errors 2014-09-07 16:59:51 +02:00
Alexander Bock 56af198171 Updated openspace-data pointer 2014-09-07 16:25:27 +02:00
Alexander Bock 1ed86079e3 Added the RenderableStars fies to the CMakeLists file 2014-09-07 16:16:40 +02:00
Alexander Bock 0e12366020 Added LuaConversions test suite 2014-09-07 16:02:20 +02:00
Alexander Bock aa36f7d776 Added check to test for equal names for Propertys and PropertyOwners 2014-09-07 16:00:48 +02:00
Alexander Bock 659b4ff3b8 Added documentation to PropertyOwner 2014-09-07 15:54:17 +02:00
Alexander Bock eb7d1aac06 Added documentation to Property class
Modified callback function mechanism to only allow one call back function to be present
2014-09-07 15:02:35 +02:00
michal da9938584e Changes to the shaders, code cleanup and simplification. Eliminated lots of minor trivial bugs, should run smoothly.
- added shader-side B-V (blue-visible band) index conversion to standard RGB 0-255
- distance-modulus is computed correctly (to the 9th decimal) from one of the interleaved parameters of the vbo
- the apparent magnitudes are in relation to the cameras position in space. (needs a proper overlook / calibration)
- sprite quads are scaled with the apparent magnitude in heuristic fashion (ogl coordinates have really no real relation to empirical data)

TODO:
- Look over the quad scaling which right now is scaled using the z-distance and apparent magnitude, wont work properly if we move outside of the solar system
- Determine if scale of universe is proper
- When zooming out the camera stops at #INF and gets stuck ( had no time to look into this )
- Very red stars need dimming, probably a threshold operation
2014-09-05 16:16:55 -04:00
Alexander Bock cd29bbee70 Added more conversion tests 2014-09-03 13:14:25 +02:00
Alexander Bock d8fb539245 Fixed warning 2014-09-03 00:24:08 +02:00
Alexander Bock dcfcc00092 Fixed to-Lua and from-Lua functions for all properties
Corrected serialization of Vectorproperties into tables
2014-09-03 00:18:57 +02:00
Alexander Bock bbf707db1c Implemented first Lua serialization tests
Fixed to-Lua and from-Lua functions for MatrixProperties
2014-09-02 23:58:06 +02:00
Alexander Bock bc7dbf4678 Merge branch 'develop' into properties 2014-09-02 21:24:42 +02:00
Alexander Bock 5c664798cb Adapted OpenSpace header in favor of Ghoul header in test cases 2014-09-02 21:24:32 +02:00
Alexander Bock 9436f5efb0 Merge branch 'develop' into properties 2014-09-02 21:20:40 +02:00
Alexander Bock ac80776a28 Cleanup test code; removed warnings mostly and reenabled scenegraph test 2014-09-02 21:20:10 +02:00
Alexander Bock 98edb338cb Removed empty files 2014-09-02 21:18:35 +02:00
Alexander Bock be3f727706 Apply to-Lua and from-Lua functionality to TemplateProperty as well 2014-09-02 20:59:29 +02:00
Alexander Bock d90e35372a Added possibility to specify a conversion function between C++ and Lua for properties 2014-09-02 20:04:42 +02:00
Alexander Bock 667dc6a3fc Started work on alternate property definition to take Lua scripting into account 2014-09-01 18:02:59 +02:00
Alexander Bock e7697a4ce0 Enable setting and getting property values from Lua scripts 2014-08-31 17:52:02 +02:00
Alexander Bock 5add1682d3 More work on properties
Added notify method to templateproperty's set method
Fixed names of subpropertyowners
2014-08-31 16:08:19 +02:00
michal 7bd44efc8e code optimization, cleanup. 2014-08-30 21:33:30 -04:00
michal d15ae9d578 some code cleanup. loading of test-target speckfile. 2014-08-30 20:29:14 -04:00
michal 7e078352d0 Fixes to shader pipeline.
- Added second shader for points only
- VBO interleaved array passed to both shaders
- passthrough in geom. shader works
- reading of additional scalar data from speck files.

TODO: calibrate scale and apparent brightnesses
2014-08-30 16:40:44 -04:00
Alexander Bock 9671921331 More work towards a unified interface for accessing properties 2014-08-30 10:01:11 +02:00
Alexander Bock 79174d5b6c Cleaned up scripts directory
Made scripts runnable at startup
Added printing functions and remapped default Lua printing
2014-08-29 13:04:20 +02:00
michal b1851e5313 Added geometry shader for halos and separate shader for points. Parsecs->m conversion works and added test-data to datafolder. 2014-08-28 23:04:27 -04:00
michal fa7b3748a9 small changes to the frag shader 2014-08-27 10:37:41 -04:00
michal 30d47896c8 detached head should be fixed 2014-08-27 10:34:47 -04:00
michal 10352b90a8 fixing detached head problem 2014-08-27 10:23:31 -04:00
michal ee225a7427 openspace data was uncommited 2014-08-26 19:28:16 -04:00
michal 8f3bcdeb54 WIP3: problems with texture coordinates, needs fix. 2014-08-26 19:26:09 -04:00
michal de3827ee39 WIP: intermediary commit2 2014-08-25 17:38:33 -04:00