diff --git a/examples/dokk/datafiles/dengue/top_ten.ini b/examples/dokk/datafiles/dengue/top_ten.ini index ad2da7c8e8acfe2310e9ddf1b82a7359a34b6b5a..64353359cc068c71cfa1b6260ad4be70d03f4908 100644 --- a/examples/dokk/datafiles/dengue/top_ten.ini +++ b/examples/dokk/datafiles/dengue/top_ten.ini @@ -1,5 +1,5 @@ [10] -score = 32.7570391734 +score = 2.80041636229 name = AAA [1] @@ -7,34 +7,34 @@ score = 1.06508742174 name = AAA [3] -score = 1.22069145838 +score = 1.08804896275 name = STU [2] -score = 1.08804896275 +score = 1.08776344856 name = STU [5] -score = 1.34045518637 +score = 1.26454350948 name = STU [4] -score = 1.26454350948 +score = 1.22069145838 name = STU [7] -score = 1.87384883563 -name = BIO +score = 1.57162377437 +name = STU [6] -score = 1.57162377437 +score = 1.34045518637 name = STU [9] -score = 2.80041636229 -name = AAA - -[8] score = 2.58003196716 name = STU +[8] +score = 1.87384883563 +name = BIO + diff --git a/examples/dokk/datafiles/thrombin/top_ten.ini b/examples/dokk/datafiles/thrombin/top_ten.ini index 8b137891791fe96927ad78e64b0aad7bded08bdc..5c0b556ba6a9c5ff99cd52b63f15ba7946d92ef1 100644 --- a/examples/dokk/datafiles/thrombin/top_ten.ini +++ b/examples/dokk/datafiles/thrombin/top_ten.ini @@ -1 +1,8 @@ +[1] +score = 30.0449929992 +name = STU + +[2] +score = 30.0515190323 +name = AAA diff --git a/examples/dokk/level_info.py b/examples/dokk/level_info.py index 76c4cf0f69540e362c526c628eb322c05a0094ff..74135b49bfbf365470e0e53ce50d40916c8c7a67 100644 --- a/examples/dokk/level_info.py +++ b/examples/dokk/level_info.py @@ -68,7 +68,7 @@ class HighScore(QtCore.QObject): text += "\n%-2s%5s%-6s%5s%+6s"%(str("%-2i"%i), "", data[0],"", str("%3.2f"%float(data[1]))) i += 1 data = self.topten.GetData(i) - rect = QtCore.QRect(QtCore.QPoint(60, 200), QtCore.QSize(24*20, (i+2)*30)) + rect = QtCore.QRect(QtCore.QPoint(60, 300), QtCore.QSize(24*20, (i+2)*30)) self.hud_bg = RectHUDObject(-1,rect, bg_color=QtGui.QColor(128,128,128,200)) dokk.Dokk().gl_win.AddHUDObject(self.hud_bg) self.hud_text = RectTextHUDObject(text, rect=rect, time=-1, font=QtGui.QFont("Courier",20)) @@ -122,7 +122,7 @@ class LevelDescr(QtCore.QObject): def Start(self): descr_len = len(self.descr) xpos = dokk.Dokk().gl_win.Width()/2 - (descr_len*30)/2 - rect = QtCore.QRect(QtCore.QPoint(xpos, dokk.Dokk().gl_win.Height()-400), QtCore.QSize(descr_len*30, 105)) + rect = QtCore.QRect(QtCore.QPoint(xpos, dokk.Dokk().gl_win.Height()-105), QtCore.QSize(descr_len*30, 105)) self.hud_bg = RectHUDObject(-1,rect, bg_color=QtGui.QColor(128,128,128,200)) dokk.Dokk().gl_win.AddHUDObject(self.hud_bg) self.hud_descr_text = RectTextHUDObject(self.descr, rect=rect, time=-1, font=QtGui.QFont("Verdana",20)) diff --git a/examples/dokk/name_enter.py b/examples/dokk/name_enter.py index 6eaa046bb7b93e211f2820cc51faaadea0ef564f..573dae0442885686af1de0470d9c2d4e5eb50fef 100644 --- a/examples/dokk/name_enter.py +++ b/examples/dokk/name_enter.py @@ -2,7 +2,7 @@ import dokk from PyQt4 import QtCore, QtGui from hud import * from ost import gui - +from level_info import HighScore ALPHABET = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','0','1','2','3','4','5','6','7','8','9'] LETTER_BREAK = 3000 @@ -15,9 +15,7 @@ class NameEnter(QtCore.QObject): self._spnav = gui.SpnavInput.GetQThread() self._spnav.start() except AttributeError: - self._spnav = None - - + self._spnav = None self.Reset() def Reset(self): @@ -108,11 +106,13 @@ class HUDNameInput(QtCore.QObject): self.connect(self.ne,QtCore.SIGNAL("Changed()"),self.Update) self.connect(self.ne,QtCore.SIGNAL("Finished()"),self.Finish) self.huds = list() - + self.high_score = HighScore(None) self.hud_text = None self.bg = None def Start(self): + self.high_score.topten = dokk.Dokk().GetLevel().topten + self.high_score.Start() self.ne.Start() del(self.huds[:]) rect = QtCore.QRect(QtCore.QPoint(60, 60), QtCore.QSize(dokk.Dokk().gl_win.Width()-120, 220)) @@ -145,6 +145,7 @@ class HUDNameInput(QtCore.QObject): self.huds[i].color = QtGui.QColor(255,255,255) def Stop(self): + self.high_score.Finish() self.ne.Stop() for hud in self.huds: dokk.Dokk().gl_win.RemoveHUDObject(hud) diff --git a/examples/dokk/spnav_input.py b/examples/dokk/spnav_input.py index fe463ecc9da4371d1f1794f7df4293700982b18f..e51798578ed9842c8d4a75ec8b22481d997fa426 100644 --- a/examples/dokk/spnav_input.py +++ b/examples/dokk/spnav_input.py @@ -22,7 +22,7 @@ class SpnavInputDevice(QtCore.QObject): self.rot = True self._lock_input = False - self._trans_factor = 0.5 + self._trans_factor = 0.125 self.score_scip = 0 def SetLevel(self, level):