|
@@ -97,8 +97,11 @@ class LevelModel:
|
|
|
tile_index = self.map.defineName(item[0])
|
|
|
floor_tex = self.map.floorDict[item[0]][0]
|
|
|
floor_ht = self.map.floorDict[item[0]][1]
|
|
|
+ ceil_tex = self.map.ceilDict[item[0]][0]
|
|
|
+ ceil_ht = self.map.ceilDict[item[0]][1]
|
|
|
# print("tile: %s, %s, %s" % (tile_index, item[0], floor_ht))
|
|
|
self.add_block(0-x, floor_ht / 4, 0-y, floor_tex)
|
|
|
+ self.add_block(0-x, 8 - ceil_ht / 4, 0-y, ceil_tex)
|
|
|
|
|
|
for e in self.map.elements:
|
|
|
# if below a certain value, it's from itemSprites
|
|
@@ -152,10 +155,10 @@ class Camera:
|
|
|
self.rot[0] = -90
|
|
|
|
|
|
def update(self,dt,keys):
|
|
|
- sens = 0.1
|
|
|
+ sens = 0.5
|
|
|
s = dt*10
|
|
|
rotY = -self.rot[1]/180*math.pi
|
|
|
- dx, dz = s*math.sin(rotY), math.cos(rotY)
|
|
|
+ dx, dz = s*math.sin(rotY), s*math.cos(rotY)
|
|
|
if keys[key.W]:
|
|
|
self.pos[0] += dx*sens
|
|
|
self.pos[2] -= dz*sens
|
|
@@ -216,9 +219,8 @@ class Window(pyglet.window.Window):
|
|
|
pyglet.clock.schedule(self.update)
|
|
|
|
|
|
self.model = LevelModel(assets_folder)
|
|
|
- self.player = Camera((0.5,1.5,1.5),(-30,0))
|
|
|
-
|
|
|
- self.model.load_level_image('level0.gif')
|
|
|
+ self.model.load_level_image('testlvl1.gif')
|
|
|
+ self.player = Camera(self.model.map.playerStart, (-30,0))
|
|
|
|
|
|
def on_mouse_motion(self,x,y,dx,dy):
|
|
|
if self.mouse_lock: self.player.mouse_motion(dx,dy)
|