Add bordeaux-threads, make simple example echoing client position to server
This commit is contained in:
parent
6f65a71f4b
commit
1efecbd0c6
|
@ -1,12 +1,37 @@
|
||||||
(load "~/quicklisp/setup.lisp") ; need to load quicklisp
|
(load "~/quicklisp/setup.lisp") ; need to load quicklisp
|
||||||
(ql:quickload '(:cl-raylib :cl-bcrypt :usocket :simple-actors :bordeaux-threads))
|
(ql:quickload '(:cl-raylib :cl-bcrypt :usocket :bordeaux-threads :alexandria))
|
||||||
|
|
||||||
(defpackage :mmo-client
|
(defpackage :mmo-client
|
||||||
(:use :common-lisp :cl-raylib :3d-vectors))
|
(:use :common-lisp :cl-raylib :3d-vectors :usocket :bordeaux-threads :alexandria))
|
||||||
|
|
||||||
(in-package :mmo-client)
|
(in-package :mmo-client)
|
||||||
|
|
||||||
(defun main ()
|
(defvar *lock* (bt:make-lock))
|
||||||
|
(defvar *logged-in-users-hash* (make-hash-table))
|
||||||
|
|
||||||
|
(defun add-entry (key value)
|
||||||
|
(bt:with-lock-held (*lock*)
|
||||||
|
(setf (gethash key *logged-in-users-hash*) value)))
|
||||||
|
|
||||||
|
(defun get-value (key)
|
||||||
|
(bt:with-lock-held (*lock*)
|
||||||
|
(gethash key *logged-in-users-hash*)))
|
||||||
|
|
||||||
|
(add-entry 'pos (vec 0.0 0.0 0.0))
|
||||||
|
|
||||||
|
(defun create-client ()
|
||||||
|
(usocket:with-client-socket (socket stream "127.0.0.1" 5001
|
||||||
|
:element-type 'character)
|
||||||
|
(unwind-protect
|
||||||
|
(progn
|
||||||
|
(loop
|
||||||
|
(format stream "~a~%" (get-value 'pos))
|
||||||
|
(force-output stream)
|
||||||
|
(usocket:wait-for-input socket)
|
||||||
|
(format t "from server: ~a~%" (read-line stream)))))
|
||||||
|
(usocket:socket-close socket)))
|
||||||
|
|
||||||
|
(defun game-loop ()
|
||||||
(let* ((screen-width 800)
|
(let* ((screen-width 800)
|
||||||
(screen-height 450)
|
(screen-height 450)
|
||||||
(username "username")
|
(username "username")
|
||||||
|
@ -17,12 +42,17 @@
|
||||||
:fovy 60.0
|
:fovy 60.0
|
||||||
:projection :camera-perspective))
|
:projection :camera-perspective))
|
||||||
(cube-screen-pos (vec 0.0 0.0)))
|
(cube-screen-pos (vec 0.0 0.0)))
|
||||||
|
|
||||||
|
(add-entry 'pos (camera3d-target camera))
|
||||||
|
|
||||||
(with-window (screen-width screen-height title)
|
(with-window (screen-width screen-height title)
|
||||||
(disable-cursor)
|
(disable-cursor)
|
||||||
(set-target-fps 60) ; Set our game to run at 60 FPS
|
(set-target-fps 60) ; Set our game to run at 60 FPS
|
||||||
(loop
|
(loop
|
||||||
until (window-should-close) ; detect window close button or ESC key
|
until (window-should-close) ; detect window close button or ESC key
|
||||||
do (update-camera camera :camera-third-person)
|
do
|
||||||
|
(update-camera camera :camera-third-person)
|
||||||
|
(add-entry 'pos (camera3d-target camera))
|
||||||
(setf cube-screen-pos (get-world-to-screen (v+ (camera3d-target camera) (vec 0 1.0 0)) camera))
|
(setf cube-screen-pos (get-world-to-screen (v+ (camera3d-target camera) (vec 0 1.0 0)) camera))
|
||||||
(with-drawing
|
(with-drawing
|
||||||
(clear-background :raywhite)
|
(clear-background :raywhite)
|
||||||
|
@ -33,4 +63,8 @@
|
||||||
(draw-text username (- (floor (vx cube-screen-pos)) (floor (measure-text username 20) 2))
|
(draw-text username (- (floor (vx cube-screen-pos)) (floor (measure-text username 20) 2))
|
||||||
(floor (vy cube-screen-pos) ) 20 :black))))))
|
(floor (vy cube-screen-pos) ) 20 :black))))))
|
||||||
|
|
||||||
(main)
|
(bt:make-thread 'create-client)
|
||||||
|
(bt:make-thread 'game-loop)
|
||||||
|
|
||||||
|
(bt:run-in-new-thread (bt:get-thread 'create-client))
|
||||||
|
(bt:run-in-new-thread (bt:get-thread 'game-loop))
|
||||||
|
|
|
@ -1,8 +1,27 @@
|
||||||
(load "~/quicklisp/setup.lisp")
|
(load "~/quicklisp/setup.lisp")
|
||||||
(ql:quickload '(:usocket :simple-actors :bordeaux-threads :cl-bcrypt :datafly :sxql))
|
(ql:quickload '(:usocket :bordeaux-threads :cl-bcrypt :datafly :sxql :alexandria))
|
||||||
|
|
||||||
(defpackage :mmo-server
|
(defpackage :mmo-server
|
||||||
(:use :common-lisp :usocket :simple-actors :bordeaux-threads)
|
(:use :common-lisp :usocket :bordeaux-threads :cl-bcrypt :datafly :sxql :alexandria))
|
||||||
(:export :accept-connections))
|
|
||||||
|
|
||||||
(in-package :mmo-server)
|
(in-package :mmo-server)
|
||||||
|
|
||||||
|
(defvar *logged-in-users-hash* (make-hash-table))
|
||||||
|
|
||||||
|
(defun create-server (port)
|
||||||
|
(let* ((socket (usocket:socket-listen "127.0.0.1" port))
|
||||||
|
(connection (usocket:socket-accept socket :element-type
|
||||||
|
'character)))
|
||||||
|
(unwind-protect
|
||||||
|
(progn
|
||||||
|
(loop do
|
||||||
|
(setq message (read-line (usocket:socket-stream connection)))
|
||||||
|
(format (usocket:socket-stream connection)
|
||||||
|
"Hello ~a~%" message)
|
||||||
|
(force-output (usocket:socket-stream connection))))
|
||||||
|
(progn
|
||||||
|
(format t "Closing sockets~%")
|
||||||
|
(usocket:socket-close connection)
|
||||||
|
(usocket:socket-close socket)))))
|
||||||
|
|
||||||
|
(create-server 5001)
|
||||||
|
|
Loading…
Reference in New Issue