quantum/punyverse
1
0
Fork 0
mirror of https://github.com/quantum5/punyverse.git synced 2025-04-24 13:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplified implementation according to issue. Refs #98.

Browse source
This commit is contained in:
Quantum 2013-11-09 10:08:59 -05:00
parent d2a6230eb3
commit 06dd46588c
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
punyverse/game.py
View file

@ -69,8 +69,8 @@ class Applet(pyglet.window.Window):
] ]
self.__time_per_second_cache = None self.__time_per_second_cache = None
self.__time_per_second_value = None self.__time_per_second_value = None
self.clock = pyglet.clock.Clock() self.__time_accumulate = 0
pyglet.clock.schedule(lambda dt: None) pyglet.clock.schedule(self.update)
def speed_incrementer(object, increment): def speed_incrementer(object, increment):
def incrementer(): def incrementer():
@ -245,25 +245,33 @@ class Applet(pyglet.window.Window):
self.__time_per_second_value = result self.__time_per_second_value = result
return result return result
def update(self, dt):
c = self.cam
if self.exclusive:
if key.A in self.keys:
c.roll += 4 * dt * 10
if key.S in self.keys:
c.roll -= 4 * dt * 10
if self.moving:
c.move(self.speed * 10 * dt)
if self.running:
delta = self.tick * dt
update = int(delta + self.__time_accumulate + 0.5)
if update:
self.__time_accumulate = 0
self.world.tick += update
for entity in self.world.tracker:
entity.update()
else:
self.__time_accumulate += delta
def on_draw(self): def on_draw(self):
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
glLoadIdentity() glLoadIdentity()
c = self.cam c = self.cam
delta = self.clock.tick()
if self.exclusive:
if key.A in self.keys:
c.roll += 4 * delta * 10
if key.S in self.keys:
c.roll -= 4 * delta * 10
if self.moving:
c.move(self.speed * 10 * delta)
if self.running:
self.world.tick += int(self.tick * delta + 0.5)
for entity in self.world.tracker:
entity.update()
x, y, z = c.x, c.y, c.z x, y, z = c.x, c.y, c.z
glRotatef(c.pitch, 1, 0, 0) glRotatef(c.pitch, 1, 0, 0)
glRotatef(c.yaw, 0, 1, 0) glRotatef(c.yaw, 0, 1, 0)
@ -367,11 +375,11 @@ class Applet(pyglet.window.Window):
if self.info_precise: if self.info_precise:
info = ('%d FPS @ (x=%.2f, y=%.2f, z=%.2f) @ %s, %s/s\n' info = ('%d FPS @ (x=%.2f, y=%.2f, z=%.2f) @ %s, %s/s\n'
'Direction(pitch=%.2f, yaw=%.2f, roll=%.2f)\nTick: %d' % 'Direction(pitch=%.2f, yaw=%.2f, roll=%.2f)\nTick: %d' %
(self.clock.get_fps(), c.x, c.y, c.z, self.speed, self.get_time_per_second(), (pyglet.clock.get_fps(), c.x, c.y, c.z, self.speed, self.get_time_per_second(),
c.pitch, c.yaw, c.roll, self.world.tick)) c.pitch, c.yaw, c.roll, self.world.tick))
else: else:
info = ('%d FPS @ (x=%.2f, y=%.2f, z=%.2f) @ %s, %s/s\n' % info = ('%d FPS @ (x=%.2f, y=%.2f, z=%.2f) @ %s, %s/s\n' %
(self.clock.get_fps(), c.x, c.y, c.z, self.speed, self.get_time_per_second())) (pyglet.clock.get_fps(), c.x, c.y, c.z, self.speed, self.get_time_per_second()))
self.label.text = info self.label.text = info
self.label.draw() self.label.draw()