lp:~stellarium/stellarium/SoCiS2016
Created by
gzotti
and last modified
This is the branch in which SoCiS2016 is developed.
Major points:
- consolidating properties/
- RemoteSync
- OBJ asteroids
- further improvements in Scenery3D
- Get this branch:
- bzr branch lp:~stellarium/stellarium/SoCiS2016
Members of
Stellarium
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- gzotti: Approve
-
Diff: 254406 lines (+239312/-6329)249 files modifiedCMakeLists.txt (+4/-3)
cmake/default_config.ini.cmake (+2/-0)
data/CMakeLists.txt (+3/-0)
data/shaders/planet.frag (+298/-0)
data/shaders/planet.vert (+84/-0)
data/ssystem.ini (+35/-72)
models/1682q1halley_MLfix.obj (+10100/-0)
models/243ida_MLfix.obj (+12770/-0)
models/243ida_MLfix.obj.mtl (+14/-0)
models/4vesta_21_MLfix.obj (+12803/-0)
models/4vesta_21_MLfix.obj.mtl (+14/-0)
models/951gaspra_21_MLfix.obj (+80573/-0)
models/951gaspra_21_MLfix.obj.mtl (+14/-0)
models/951gaspra_MLfix.obj (+11422/-0)
models/951gaspra_MLfix.obj.mtl (+14/-0)
models/CMakeLists.txt (+16/-0)
models/j5amalthea_MLfix.obj (+12755/-0)
models/j5amalthea_MLfix.obj.mtl (+14/-0)
models/m1phobos.mtl (+13/-0)
models/m2deimos.mtl (+13/-0)
models/n7larissa_MLfix.obj (+12803/-0)
models/n7larissa_MLfix.obj.mtl (+16/-0)
models/n8proteus_MLfix.obj (+12753/-0)
models/n8proteus_MLfix.obj.mtl (+14/-0)
models/s10janus_MLfix.obj (+12741/-0)
models/s10janus_MLfix.obj.mtl (+14/-0)
models/s11epimetheus_MLfix.obj (+12427/-0)
models/s11epimetheus_MLfix.obj.mtl (+14/-0)
models/s16prometheus_MLfix.obj (+11624/-0)
models/s16prometheus_MLfix.obj.mtl (+14/-0)
models/s17pandora_MLfix.obj (+12803/-0)
models/s17pandora_MLfix.obj.mtl (+14/-0)
models/s7hyperion_21_MLfix.obj (+12798/-0)
models/s7hyperion_21_MLfix.obj.mtl (+14/-0)
plugins/AngleMeasure/src/AngleMeasure.hpp (+1/-0)
plugins/ArchaeoLines/src/ArchaeoLines.hpp (+1/-0)
plugins/CompassMarks/src/CompassMarks.hpp (+1/-1)
plugins/EquationOfTime/src/EquationOfTime.hpp (+1/-0)
plugins/Exoplanets/src/Exoplanet.cpp (+1/-0)
plugins/Exoplanets/src/Exoplanet.hpp (+8/-1)
plugins/Exoplanets/src/Exoplanets.cpp (+10/-0)
plugins/Exoplanets/src/Exoplanets.hpp (+4/-0)
plugins/FOV/src/FOV.hpp (+1/-0)
plugins/HelloStelModule/src/HelloStelModule.hpp (+1/-0)
plugins/MeteorShowers/src/MeteorShower.cpp (+2/-0)
plugins/MeteorShowers/src/MeteorShower.hpp (+6/-2)
plugins/MeteorShowers/src/MeteorShowers.cpp (+10/-0)
plugins/MeteorShowers/src/MeteorShowers.hpp (+5/-1)
plugins/MeteorShowers/src/MeteorShowersMgr.hpp (+3/-12)
plugins/NavStars/src/NavStars.hpp (+1/-0)
plugins/Novae/src/Nova.cpp (+2/-0)
plugins/Novae/src/Nova.hpp (+11/-1)
plugins/Novae/src/Novae.cpp (+1/-1)
plugins/Novae/src/Novae.hpp (+8/-1)
plugins/Observability/src/Observability.hpp (+1/-0)
plugins/Oculars/src/Oculars.hpp (+1/-0)
plugins/PointerCoordinates/src/PointerCoordinates.hpp (+1/-0)
plugins/Pulsars/src/Pulsar.cpp (+1/-0)
plugins/Pulsars/src/Pulsar.hpp (+8/-1)
plugins/Pulsars/src/Pulsars.cpp (+1/-1)
plugins/Pulsars/src/Pulsars.hpp (+8/-1)
plugins/Quasars/src/Quasar.cpp (+1/-0)
plugins/Quasars/src/Quasar.hpp (+8/-1)
plugins/Quasars/src/Quasars.cpp (+1/-1)
plugins/Quasars/src/Quasars.hpp (+9/-1)
plugins/RemoteControl/CMakeLists.txt (+2/-2)
plugins/RemoteControl/doc/remoteControlApi.doxygen (+14/-4)
plugins/RemoteControl/include/RemoteControlServiceInterface.hpp (+220/-0)
plugins/RemoteControl/src/APIController.cpp (+70/-33)
plugins/RemoteControl/src/APIController.hpp (+11/-10)
plugins/RemoteControl/src/AbstractAPIService.cpp (+17/-117)
plugins/RemoteControl/src/AbstractAPIService.hpp (+14/-116)
plugins/RemoteControl/src/CMakeLists.txt (+2/-0)
plugins/RemoteControl/src/LocationSearchService.cpp (+3/-3)
plugins/RemoteControl/src/LocationSearchService.hpp (+4/-6)
plugins/RemoteControl/src/LocationService.cpp (+4/-32)
plugins/RemoteControl/src/LocationService.hpp (+5/-7)
plugins/RemoteControl/src/MainService.cpp (+86/-57)
plugins/RemoteControl/src/MainService.hpp (+17/-10)
plugins/RemoteControl/src/ObjectService.cpp (+2/-2)
plugins/RemoteControl/src/ObjectService.hpp (+4/-6)
plugins/RemoteControl/src/RemoteControl.hpp (+1/-0)
plugins/RemoteControl/src/RequestHandler.cpp (+27/-9)
plugins/RemoteControl/src/RequestHandler.hpp (+2/-0)
plugins/RemoteControl/src/ScriptService.cpp (+4/-5)
plugins/RemoteControl/src/ScriptService.hpp (+5/-7)
plugins/RemoteControl/src/SimbadService.cpp (+2/-2)
plugins/RemoteControl/src/SimbadService.hpp (+4/-6)
plugins/RemoteControl/src/StelActionService.cpp (+3/-3)
plugins/RemoteControl/src/StelActionService.hpp (+5/-7)
plugins/RemoteControl/src/StelPropertyService.cpp (+4/-4)
plugins/RemoteControl/src/StelPropertyService.hpp (+4/-5)
plugins/RemoteControl/src/ViewService.cpp (+7/-62)
plugins/RemoteControl/src/ViewService.hpp (+4/-6)
plugins/RemoteControl/webroot/index.html (+61/-23)
plugins/RemoteControl/webroot/js/api/remotecontrol.js (+6/-2)
plugins/RemoteControl/webroot/js/api/search.js (+56/-23)
plugins/RemoteControl/webroot/js/plugins/archaeolines.js (+0/-7)
plugins/RemoteControl/webroot/js/plugins/scenery3d.js (+117/-0)
plugins/RemoteControl/webroot/js/settings.js (+22/-19)
plugins/RemoteControl/webroot/js/translationdata.js (+5/-3)
plugins/RemoteControl/webroot/js/ui/joystickqueue.js (+168/-0)
plugins/RemoteControl/webroot/js/ui/mainui.js (+63/-33)
plugins/RemoteControl/webroot/js/ui/search.js (+37/-8)
plugins/RemoteControl/webroot/js/ui/viewcontrol.js (+2/-1)
plugins/RemoteControl/webroot/js/ui/viewoptions.js (+13/-12)
plugins/RemoteControl/webroot/style.css (+133/-57)
plugins/RemoteControl/webroot/tablet7in.html (+21/-22)
plugins/RemoteSync/CMakeLists.txt (+1/-1)
plugins/RemoteSync/src/RemoteSync.cpp (+125/-21)
plugins/RemoteSync/src/RemoteSync.hpp (+48/-12)
plugins/RemoteSync/src/SyncClient.cpp (+74/-113)
plugins/RemoteSync/src/SyncClient.hpp (+27/-9)
plugins/RemoteSync/src/SyncClientHandlers.cpp (+133/-26)
plugins/RemoteSync/src/SyncClientHandlers.hpp (+38/-7)
plugins/RemoteSync/src/SyncMessages.cpp (+46/-2)
plugins/RemoteSync/src/SyncMessages.hpp (+51/-1)
plugins/RemoteSync/src/SyncProtocol.cpp (+107/-27)
plugins/RemoteSync/src/SyncProtocol.hpp (+79/-19)
plugins/RemoteSync/src/SyncServer.cpp (+85/-138)
plugins/RemoteSync/src/SyncServer.hpp (+14/-9)
plugins/RemoteSync/src/SyncServerEventSenders.cpp (+95/-5)
plugins/RemoteSync/src/SyncServerEventSenders.hpp (+51/-7)
plugins/RemoteSync/src/SyncServerHandlers.cpp (+9/-7)
plugins/RemoteSync/src/SyncServerHandlers.hpp (+3/-3)
plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp (+102/-14)
plugins/RemoteSync/src/gui/RemoteSyncDialog.hpp (+8/-1)
plugins/RemoteSync/src/gui/remoteSyncDialog.ui (+244/-59)
plugins/Satellites/src/Satellite.cpp (+2/-0)
plugins/Satellites/src/Satellite.hpp (+10/-2)
plugins/Satellites/src/Satellites.cpp (+13/-0)
plugins/Satellites/src/Satellites.hpp (+4/-0)
plugins/Scenery3d/src/AABB.cpp (+0/-317)
plugins/Scenery3d/src/AABB.hpp (+0/-87)
plugins/Scenery3d/src/CMakeLists.txt (+6/-8)
plugins/Scenery3d/src/Frustum.cpp (+5/-12)
plugins/Scenery3d/src/Frustum.hpp (+4/-4)
plugins/Scenery3d/src/Heightmap.cpp (+365/-84)
plugins/Scenery3d/src/Heightmap.hpp (+66/-12)
plugins/Scenery3d/src/Line.cpp (+0/-33)
plugins/Scenery3d/src/Line.hpp (+0/-42)
plugins/Scenery3d/src/OBJ.cpp (+0/-1858)
plugins/Scenery3d/src/OBJ.hpp (+0/-382)
plugins/Scenery3d/src/Plane.hpp (+1/-1)
plugins/Scenery3d/src/Polyhedron.cpp (+4/-4)
plugins/Scenery3d/src/Polyhedron.hpp (+3/-3)
plugins/Scenery3d/src/S3DRenderer.cpp (+589/-862)
plugins/Scenery3d/src/S3DRenderer.hpp (+63/-95)
plugins/Scenery3d/src/S3DScene.cpp (+399/-0)
plugins/Scenery3d/src/S3DScene.hpp (+184/-0)
plugins/Scenery3d/src/SceneInfo.cpp (+37/-29)
plugins/Scenery3d/src/SceneInfo.hpp (+11/-5)
plugins/Scenery3d/src/Scenery3d.cpp (+431/-247)
plugins/Scenery3d/src/Scenery3d.hpp (+51/-17)
plugins/Scenery3d/src/Scenery3dRemoteControlService.cpp (+186/-0)
plugins/Scenery3d/src/Scenery3dRemoteControlService.hpp (+54/-0)
plugins/Scenery3d/src/ShaderManager.cpp (+34/-36)
plugins/Scenery3d/src/ShaderManager.hpp (+13/-26)
plugins/Scenery3d/src/gui/Scenery3dDialog.cpp (+40/-40)
plugins/Scenery3d/src/gui/Scenery3dDialog.hpp (+2/-2)
plugins/Scenery3d/src/gui/Scenery3dDialog_p.hpp (+3/-3)
plugins/Scenery3d/src/gui/StoredViewDialog.cpp (+3/-3)
plugins/Scenery3d/src/gui/StoredViewDialog.hpp (+2/-2)
plugins/SimpleDrawLine/src/SimpleDrawLine.hpp (+1/-0)
plugins/SolarSystemEditor/src/SolarSystemEditor.hpp (+1/-0)
plugins/Supernovae/src/Supernova.cpp (+2/-0)
plugins/Supernovae/src/Supernova.hpp (+8/-1)
plugins/Supernovae/src/Supernovae.cpp (+1/-1)
plugins/Supernovae/src/Supernovae.hpp (+8/-1)
plugins/TelescopeControl/src/TelescopeControl.cpp (+5/-0)
plugins/TelescopeControl/src/TelescopeControl.hpp (+3/-0)
plugins/TelescopeControl/src/clients/TelescopeClient.cpp (+1/-0)
plugins/TelescopeControl/src/clients/TelescopeClient.hpp (+3/-1)
plugins/TextUserInterface/src/TextUserInterface.hpp (+1/-0)
po/stellarium-remotecontrol/POTFILES.in (+1/-1)
po/stellarium-remotecontrol/stellarium-remotecontrol.jst (+23/-14)
scenery3d/Testscene/Stellarium-Testscene_withGrid_Bump-separateSpheres.mtl (+6/-0)
src/CMakeLists.txt (+6/-0)
src/StelMainView.cpp (+11/-1)
src/StelMainView.hpp (+7/-0)
src/core/GeomMath.cpp (+158/-0)
src/core/GeomMath.hpp (+115/-0)
src/core/StelApp.cpp (+7/-1)
src/core/StelApp.hpp (+5/-0)
src/core/StelCore.cpp (+29/-9)
src/core/StelCore.hpp (+2/-0)
src/core/StelLocation.cpp (+3/-1)
src/core/StelModuleMgr.cpp (+22/-0)
src/core/StelModuleMgr.hpp (+13/-0)
src/core/StelMovementMgr.cpp (+5/-5)
src/core/StelMovementMgr.hpp (+3/-2)
src/core/StelOBJ.cpp (+1373/-0)
src/core/StelOBJ.hpp (+385/-0)
src/core/StelObject.hpp (+14/-0)
src/core/StelObjectMgr.cpp (+96/-81)
src/core/StelObjectMgr.hpp (+14/-2)
src/core/StelObjectModule.hpp (+7/-0)
src/core/StelObserver.cpp (+1/-1)
src/core/StelOpenGLArray.cpp (+311/-0)
src/core/StelOpenGLArray.hpp (+154/-0)
src/core/StelPainter.cpp (+12/-11)
src/core/StelPluginInterface.hpp (+10/-1)
src/core/StelPropertyMgr.cpp (+6/-1)
src/core/StelPropertyMgr.hpp (+9/-5)
src/core/StelSphereGeometry.cpp (+1/-1)
src/core/StelTexture.cpp (+146/-63)
src/core/StelTexture.hpp (+26/-8)
src/core/StelTextureMgr.cpp (+113/-12)
src/core/StelTextureMgr.hpp (+23/-6)
src/core/StelUtils.cpp (+29/-9)
src/core/StelUtils.hpp (+9/-0)
src/core/VecMath.hpp (+159/-24)
src/core/modules/Asterism.cpp (+1/-0)
src/core/modules/Asterism.hpp (+3/-1)
src/core/modules/AsterismMgr.cpp (+15/-0)
src/core/modules/AsterismMgr.hpp (+3/-0)
src/core/modules/Comet.cpp (+22/-14)
src/core/modules/Comet.hpp (+11/-4)
src/core/modules/Constellation.cpp (+2/-0)
src/core/modules/Constellation.hpp (+3/-1)
src/core/modules/ConstellationMgr.cpp (+15/-0)
src/core/modules/ConstellationMgr.hpp (+3/-0)
src/core/modules/CustomObject.cpp (+1/-0)
src/core/modules/CustomObject.hpp (+8/-1)
src/core/modules/CustomObjectMgr.hpp (+3/-0)
src/core/modules/LandscapeMgr.cpp (+1/-1)
src/core/modules/MilkyWay.cpp (+8/-1)
src/core/modules/MilkyWay.hpp (+3/-0)
src/core/modules/MinorPlanet.cpp (+10/-9)
src/core/modules/MinorPlanet.hpp (+3/-3)
src/core/modules/Nebula.cpp (+3/-1)
src/core/modules/Nebula.hpp (+5/-2)
src/core/modules/NebulaMgr.hpp (+3/-0)
src/core/modules/Planet.cpp (+1090/-417)
src/core/modules/Planet.hpp (+157/-39)
src/core/modules/SolarSystem.cpp (+116/-34)
src/core/modules/SolarSystem.hpp (+59/-3)
src/core/modules/Star.cpp (+2/-0)
src/core/modules/Star.hpp (+2/-0)
src/core/modules/StarMgr.cpp (+10/-0)
src/core/modules/StarMgr.hpp (+3/-0)
src/core/modules/StarWrapper.hpp (+2/-1)
src/core/modules/ZodiacalLight.cpp (+9/-1)
src/core/modules/ZodiacalLight.hpp (+3/-0)
src/gui/ConfigurationDialog.cpp (+4/-0)
src/gui/LocationDialog.cpp (+1/-1)
src/gui/ViewDialog.cpp (+8/-2)
src/gui/viewDialog.ui (+65/-1)
src/main.cpp (+3/-0)
Related bugs
Bug #1153171: Non-spherical/polygonal satellites | Wishlist | Fix Released |
Related blueprints
Branch information
Recent revisions
- 8548. By Florian Schaukowitsch
-
StelOBJ: Treat "g" groups the same way as "o" objects, and ignore empty groups
- 8547. By Florian Schaukowitsch
-
Fixed RemoteControl not working on Linux, stupid case-sensitive file systems :)
- 8546. By Florian Schaukowitsch
-
RemoteControl:
Made the "buttons" in the new joystick control also work to move the view
Replaced old joystick view control on the "Main" tab with the new one, but retained the JS code for the old style for now
Re-format the joystickqueue.js to have the same code style as the older files - 8545. By Florian Schaukowitsch
-
RemoteControl: Further generalize the joystick control and add a view direction joystick to Scenery3d
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:stellarium