1111#include < BALL/VIEW/DIALOGS/FDPBDialog.h>
1212#include < BALL/VIEW/DIALOGS/modifyRepresentationDialog.h>
1313#include < BALL/VIEW/DIALOGS/molecularFileDialog.h>
14- # include < BALL/VIEW/DIALOGS/ lightSettings.h>
15- # include < BALL/VIEW/DIALOGS/stageSettings.h >
14+ // 999.58-03 — lightSettings.h / stageSettings.h dropped: the tutorial no longer
15+ // reaches the scene dialog accessors (the dormant RTfact Stage-setup logic remains).
1616
1717#include < BALL/VIEW/DATATYPE/standardDatasets.h>
1818
@@ -107,23 +107,24 @@ void DemoTutorialDialog::initDemo_()
107107 Stage* stage = Scene::getInstance (0 )->getStage ();
108108
109109 stage->setBackgroundColor (color);
110- StageSettings* stage_settings = Scene::getInstance (0 )->getStageSettings ();
111- stage_settings->updateFromStage ();
110+ // 999.58-03 — the legacy stage_settings->updateFromStage() / LightSettings
111+ // updateFromStage() dialog-widget refreshes are dropped: Scene no longer owns
112+ // those dialogs. The Stage mutations below + applyPreferences() (which now
113+ // applies through the Inspector controllers) carry the actual render effect.
112114
113- // TODO: get rid of this hack.
115+ // TODO: get rid of this hack.
114116 // TODO: BALLView should come up with good light settings by itself!
115- // set a good light source
117+ // set a good light source
116118 stage->clearLightSources ();
117119
118120 LightSource ls;
119-
121+
120122 ls.setPosition (Vector3 (1 , -2 , -15 ));
121123 ls.setAttenuation (Vector3 (0 ., 0 ., 0.3 ));
122124 ls.setType (LightSource::POSITIONAL);
123125 ls.setColor (ColorRGBA (255 , 255 , 255 , 255 ));
124126 ls.setIntensity (500 ./100 );
125127 stage->addLightSource (ls);
126- LightSettings::getInstance (0 )->updateFromStage ();
127128 // apply everything to the scene...
128129 Scene::getInstance (0 )->applyPreferences ();
129130#endif
@@ -168,22 +169,21 @@ void DemoTutorialDialog::initTutorials_()
168169
169170 stage->setBackgroundColor (color);
170171
171- StageSettings* stage_settings = Scene::getInstance ( 0 )-> getStageSettings ();
172- stage_settings-> updateFromStage ();
172+ // 999.58-03 — dialog-widget refresh calls dropped (Scene no longer owns the
173+ // stage/light dialogs); the Stage mutations below are the live render effect.
173174
174175 // get one useable light source
175176 stage->clearLightSources ();
176177
177178 LightSource ls;
178-
179+
179180 ls.setPosition (Vector3 (1 , -2 , -15 ));
180181 ls.setAttenuation (Vector3 (0 ., 0 ., 0.7 ));
181182 ls.setType (LightSource::POSITIONAL);
182183 ls.setColor (ColorRGBA (255 , 255 , 255 , 255 ));
183184 ls.setIntensity (500 ./100 );
184185
185186 stage->addLightSource (ls);
186- LightSettings::getInstance (0 )->updateFromStage ();
187187#endif
188188 if (tutorial_type_ == TUTORIAL)
189189 {
@@ -208,7 +208,9 @@ void DemoTutorialDialog::initTutorials_()
208208 rt_material.shininess = 75.031 ;
209209 rt_material.transparency = 0 ;
210210
211- Scene::getInstance (0 )->getMaterialSettings ()->updateDefaultMaterialsFromStage ();
211+ // 999.58-03 — the legacy getMaterialSettings()->updateDefaultMaterialsFromStage()
212+ // dialog-widget refresh is dropped; the Stage::Material writes above + the
213+ // applyPreferences() below carry the render effect via the MaterialController.
212214
213215 // set ball and stick as next model
214216 DisplayProperties::getInstance (0 )->selectModel (MODEL_BALL_AND_STICK);
@@ -363,8 +365,8 @@ void DemoTutorialDialog::nextStepClicked()
363365 // prepare the background for the next step
364366 ColorRGBA color (255 , 255 , 255 , 255 ); // white
365367 Scene::getInstance (0 )->getStage ()->setBackgroundColor (color);
366- StageSettings* stage_settings = Scene::getInstance ( 0 )-> getStageSettings ();
367- stage_settings-> updateFromStage ();
368+ // 999.58-03 — dialog-widget refresh dropped; applyPreferences() applies
369+ // the live Stage background through the Inspector StageController.
368370 Scene::getInstance (0 )->applyPreferences ();
369371 break ;
370372 }
@@ -379,7 +381,8 @@ void DemoTutorialDialog::nextStepClicked()
379381 ls.setType (LightSource::POSITIONAL);
380382 ls.setColor (ColorRGBA (255 , 255 , 255 , 255 )); // ColorRGBA(255, 245, 208, 255));
381383 ls.setIntensity (0 .25f );
382- LightSettings::getInstance (0 )->updateFromStage ();
384+ // 999.58-03 — dialog-widget refresh dropped; the live LightSource
385+ // mutation above is applied via applyPreferences() below.
383386
384387 // then change the camera position
385388 Camera& camera = Scene::getInstance (0 )->getStage ()->getCamera ();
0 commit comments