diff --git a/examples/dokk/glwin.py b/examples/dokk/glwin.py index 10037ee97ea63ef265ca0216d56bf95abe814abb..747dfc2ea2c663a5a88a385341dfc4ec01d76fbb 100644 --- a/examples/dokk/glwin.py +++ b/examples/dokk/glwin.py @@ -55,7 +55,7 @@ class DokkGLCanvas(QGLWidget): painter.setPen(QPen(QColor(255,255,255), Qt.SolidLine)) painter.setFont(QFont("Verdana",20)) painter.drawText(QPoint(10, 25), "Sie sind %.1f von der L�sung entfernt" % self.dokk.GetLevel().GetRMSD()) - if self.dokk.GetLevel().IsStarted(): + if self.dokk.GetLevel().IsIntroDone(): time_col=self.dokk.GetLevel().GetRemainingTime()/10 if time_col>1: time_col=1 diff --git a/examples/dokk/level.py b/examples/dokk/level.py index 1217ff5276de1c3a381fde3d03d3b091cd197067..7cbaf9ed15c154b4c363350d197bf6c2eeb05237 100644 --- a/examples/dokk/level.py +++ b/examples/dokk/level.py @@ -30,6 +30,7 @@ class Level(QtCore.QObject): Dokk().gl_win.SetLockInput(True) self._started = False + self._intro_done = False self.emit(QtCore.SIGNAL("Stopped()")) def Load(self): @@ -116,6 +117,7 @@ class Level(QtCore.QObject): self.endtime = 0 self.stop_time = 0 self._started = False + self._intro_done = False self.timer.stop() self.CleanHUD() self.ResetPos() @@ -152,6 +154,7 @@ class Level(QtCore.QObject): else: self.hud_level_end_ntt.Start() self._started = False + self._intro_done = False def Begin(self): self.Reset() @@ -183,12 +186,16 @@ class Level(QtCore.QObject): def IsStarted(self): return self._started + + def IsIntroDone(self): + return self._intro_done def _IntroEnd(self): if self._started: Dokk().gl_win.SetLockInput(False) self.timer.start(int(self.config.Level["TIME"])) self.endtime = float(time.time()+(int(self.config.Level["TIME"]))/1000.0) + self._intro_done = True self.emit(QtCore.SIGNAL("Started()")) def _FinishEnd(self): @@ -200,4 +207,4 @@ class Level(QtCore.QObject): def _FinishEnterName(self): self.topten.SetValue(self.hud_name_input.GetName(),self.GetScore()) - self.Reset() \ No newline at end of file + self.Reset()