Archives/boomer
2
0
Fork 0
mirror of https://github.com/tsoding/boomer synced 2024-11-16 12:12:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

(#24) Extract vec2 module

Browse Source
This commit is contained in:
rexim 2019-10-03 01:03:59 +07:00
parent 839aa4e3a2
commit 081eae684f
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/boomer.nim
View File

@ -2,6 +2,8 @@ import x11/xlib, x11/x, x11/xutil
import opengl, opengl/glx
import math
import vec2
const FPS: int = 60
const SCROLL_SPEED = 1.0
const DRAG_VELOCITY_FACTOR: float = 20.0
@ -13,8 +15,6 @@ template checkError(context: string) =
if error != 0.GLenum:
echo "GL error ", error.GLint, " ", context
type Vec2 = tuple[x: float, y: float]
type Image* = object
width, height, bpp: cint
pixels: cstring
@ -31,27 +31,6 @@ var mouse_position = (0.0, 0.0)
var window: Vec2 = (0.0, 0.0)
var drag: bool = false
proc `-`(v1: Vec2, v2: Vec2): Vec2 {.inline.} = (v1.x - v2.x, v1.y - v2.y)
proc `+`(v1: Vec2, v2: Vec2): Vec2 {.inline.} = (v1.x + v2.x, v1.y + v2.y)
proc `*`(v: Vec2, s: float): Vec2 {.inline.} = (v.x * s, v.y * s)
proc `/`(v: Vec2, s: float): Vec2 {.inline.} = (v.x / s, v.y / s)
proc `+=`(v1: var Vec2, v2: Vec2) {.inline.} =
v1.x += v2.x
v1.y += v2.y
proc `*=`(v: var Vec2, s: float) {.inline.} =
v.x *= s
v.y *= s
proc len(v: Vec2): float =
sqrt(v.x * v.x + v.y * v.y)
proc norm(v: Vec2): Vec2 =
let l = v.len
if abs(l) < 1e-9:
result = (0.0, 0.0)
else:
result = (v.x / l, v.y / l)
proc screen(v: Vec2): Vec2 =
v * camera_scale + camera_position

24
src/vec2.nim Normal file
View File

@ -0,0 +1,24 @@
import math
type Vec2* = tuple[x: float, y: float]
proc `-`*(v1: Vec2, v2: Vec2): Vec2 {.inline.} = (v1.x - v2.x, v1.y - v2.y)
proc `+`*(v1: Vec2, v2: Vec2): Vec2 {.inline.} = (v1.x + v2.x, v1.y + v2.y)
proc `*`*(v: Vec2, s: float): Vec2 {.inline.} = (v.x * s, v.y * s)
proc `/`*(v: Vec2, s: float): Vec2 {.inline.} = (v.x / s, v.y / s)
proc `+=`*(v1: var Vec2, v2: Vec2) {.inline.} =
v1.x += v2.x
v1.y += v2.y
proc `*=`*(v: var Vec2, s: float) {.inline.} =
v.x *= s
v.y *= s
proc len*(v: Vec2): float =
sqrt(v.x * v.x + v.y * v.y)
proc norm*(v: Vec2): Vec2 =
let l = v.len
if abs(l) < 1e-9:
result = (0.0, 0.0)
else:
result = (v.x / l, v.y / l)