McSinyx/axuy
McSinyx
/
axuy
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Display convenient info in the title

This commit is contained in:
Nguyễn Gia Phong 2019-08-23 09:47:53 +07:00
parent fceb35ca7e
commit a8babebfdf
3 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -2,7 +2,7 @@
Mininalist first-person shooter
![icon](axuy/icon.png)
![icon](https://raw.githubusercontent.com/McSinyx/axuy/master/axuy/icon.png)
## Installation
@ -12,11 +12,6 @@ The game is still under development. For testing, first install GLFW version 3.3
```sh
$ git clone https://github.com/McSinyx/axuy.git
$ pip3 install --user --editable axuy
$ axuy
Axuy is listening at 127.0.0.1:42069
$ axuy --port=42069 &
$ axuy --seeder=localhost:42069
```
Currently, the p2p connection is still buggy but at least it works I guess.
In another terminal, execute `axuy --seeder=127.0.0.1:42069`.
The two Picos might be spawn far away from each other but definitely
they exist with the same map.

28
axuy/peer.py
View File

@ -35,30 +35,24 @@ class Peer:
"""
def __init__(self, config):
self.sock = socket(type=SOCK_DGRAM) # UDP
self.sock.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
self.sock.bind((config.host, config.port))
self.addr = self.sock.getsockname()
self.updated, lock = Event(), RLock()
if config.seeder is None:
mapid = mapidgen()
self.peers = []
mapid, self.peers = mapidgen(), []
else:
client = socket()
host, port = config.seeder.split(':')
self.peers = [(host, int(port))]
client.connect(*self.peers)
data = loads(client.recv(1024))
mapid = data['mapid']
self.peers.extend(data['peers'])
client.connect(config.seeder)
mapid, self.peers = loads(client.recv(1024))
self.updated, lock = Event(), RLock()
self.addr = config.host, config.port
self.space = mapgen(mapid)
self.pico = Picobot(self.addr, self.space)
self.view = View(self.addr, self.pico, self.space, config, lock)
Thread(target=self.serve, args=(mapid,), daemon=True).start()
self.sock = socket(type=SOCK_DGRAM) # UDP
self.sock.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
self.sock.bind(self.addr)
Thread(target=self.push, daemon=True).start()
Thread(target=self.pull, args=(lock,), daemon=True).start()
@ -68,10 +62,10 @@ class Peer:
server.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
server.bind(self.addr)
server.listen(7)
print('Axuy is listening at {}:{}'.format(*server.getsockname()))
print('Axuy is listening at {}:{}'.format(*self.addr))
while True:
conn, addr = server.accept()
conn.send(dumps({'mapid': mapid, 'peers': self.peers}))
conn.send(dumps((mapid, self.peers+[self.addr])))
conn.close()
@whilst

44
axuy/view.py
View File

@ -18,12 +18,15 @@
__doc__ = 'Axuy module for map class'
from collections import deque
from configparser import ConfigParser
from itertools import product
from os.path import join as pathjoin, pathsep
from math import degrees, log2, radians, sqrt
from random import randint
from re import IGNORECASE, match
from statistics import mean
from typing import Tuple
from warnings import warn
import glfw
@ -46,7 +49,7 @@ GLFW_VER_WARN = 'Your GLFW version appear to be lower than 3.3, '\
ZMIN, ZMAX = -1.0, 1.0
CONWAY = 1.303577269034
EDGE_BRIGHTNESS = 1/3
EDGE_BRIGHTNESS = 1/6
QUAD = np.float32([-1, -1, 1, -1, -1, 1, -1, 1, 1, -1, 1, 1]).tobytes()
OXY = np.float32([[0, 0, 0], [1, 0, 0], [1, 1, 0],
@ -120,6 +123,16 @@ class ConfigReader:
# Fallback to None when attribute is missing
def __getattr__(self, name): return None
@property
def seeder(self) -> Tuple[str, int]:
"""Seeder address."""
return self._seed
@seeder.setter
def seeder(self, value):
host, port = value.split(':')
self._seed = host, int(port)
@property
def fov(self) -> float:
"""Horizontal field of view in degrees."""
@ -134,7 +147,7 @@ class ConfigReader:
self.zmlvl = -1.0
return
elif rad > 2:
warn('Too wide FOVm falling back to the maximal value.')
warn('Too wide FOV, falling back to the maximal value.')
self.zmlvl = 1.0
return
self.zmlvl = log2(rad)
@ -241,13 +254,16 @@ class View:
Vertex data for Gaussian blur.
fringe : moderngl.Program
Processed executable code in GLSL for final combination
of the bloom effect with additional chromatic aberration.
of the bloom effect with additional chromatic aberration
and barrel distortion.
combine : moderngl.VertexArray
Vertex data for final combination of the bloom effect.
fb, ping, pong : moderngl.Framebuffer
Frame buffers for bloom-effect post-processing.
last_time : float
timestamp in seconds of the previous frame.
fpses : deque of floats
FPS during the last 5 seconds to display the average.
"""
def __init__(self, address, camera, space, config, lock):
@ -259,15 +275,17 @@ class View:
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 3)
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)
glfw.window_hint(glfw.OPENGL_FORWARD_COMPAT, True)
glfw.window_hint(glfw.DEPTH_BITS, 24)
width, height = config.size
self.window = glfw.create_window(width, height, 'Axuy', None, None)
self.window = glfw.create_window(
width, height, 'axuy@{}:{}'.format(*address), None, None)
if not self.window:
glfw.terminate()
raise RuntimeError('Failed to create GLFW window')
self.key, self.mouse = config.key, config.mouse
self.fpses = deque()
# Attributes for event-handling
self.addr = address
self.camera = camera
self.picos = {address: camera}
self.colors = {address: randint(0, 5)}
@ -415,6 +433,11 @@ class View:
"""Camera position in a NumPy array."""
return self.camera.pos
@property
def postr(self) -> str:
"""Pretty camera position representation."""
return '[{:4.1f} {:4.1f} {:3.1f}]'.format(*self.camera.pos)
@property
def right(self) -> np.float32:
"""Camera right direction."""
@ -458,7 +481,14 @@ class View:
@fps.setter
def fps(self, fps):
self.camera.fps = fps
#print(fps)
self.fpses.appendleft(fps)
@property
def fpstr(self) -> str:
"""Pretty string for displaying average FPS."""
# Average over 5 seconds, like how glxgears do it, but less efficient
while len(self.fpses) > mean(self.fpses) * 5 > 0: self.fpses.pop()
return '{} fps'.format(round(mean(self.fpses)))
def is_pressed(self, *keys) -> bool:
"""Return whether given keys are pressed."""
@ -538,6 +568,8 @@ class View:
if self.is_pressed(self.key['left']): right -= 1
if self.is_pressed(self.key['right']): right += 1
self.camera.move(right, upward, forward)
glfw.set_window_title(self.window, '{} - axuy@{}:{} ({})'.format(
self.postr, *self.addr, self.fpstr))
self.fb.use()
self.fb.clear()