MyouProject/vmath
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #49 from guzba/master

Browse source 
update for new pixie
This commit is contained in:
treeform 2021-12-16 11:36:08 -08:00 committed by GitHub
commit 2f970dd4f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/bench_raytracer.nim
View file

@ -2,7 +2,7 @@
## MIT License ## MIT License
## Copyright (c) 2021 Edin Omeragic ## Copyright (c) 2021 Edin Omeragic
import benchy, chroma, math, pixie, times, vmath import benchy, chroma, math, pixie, vmath
{.push inline, noinit, checks: off.} {.push inline, noinit, checks: off.}
@ -251,7 +251,7 @@ proc renderScene(scene: Scene, sceneImage: Image) =
var pos = y * w var pos = y * w
for x in 0 ..< w: for x in 0 ..< w:
ray.dir = getPoint(x, y, scene.camera, h, w) ray.dir = getPoint(x, y, scene.camera, h, w)
sceneImage.setRgbaUnsafe(x, y, scene.traceRay(ray, 0)) sceneImage.unsafe[x, y] = scene.traceRay(ray, 0).asRgbx()
pos = pos + 1 pos = pos + 1
proc render(): Image = proc render(): Image =

6
tests/bench_raytracer_glm.nim
View file

@ -2,8 +2,8 @@
## MIT License ## MIT License
## Copyright (c) 2021 Edin Omeragic ## Copyright (c) 2021 Edin Omeragic
import benchy, chroma, math, times, glm import benchy, chroma, math, glm
from pixie import Image, newImage, writeFile, setRgbaUnsafe from pixie import Image, newImage, writeFile, dataIndex
type Vec3 = glm.Vec3[float32] type Vec3 = glm.Vec3[float32]
@ -254,7 +254,7 @@ proc renderScene(scene: Scene, sceneImage: Image) =
var pos = y * w var pos = y * w
for x in 0 ..< w: for x in 0 ..< w:
ray.dir = getPoint(x, y, scene.camera, h, w) ray.dir = getPoint(x, y, scene.camera, h, w)
sceneImage.setRgbaUnsafe(x, y, scene.traceRay(ray, 0)) sceneImage.data[sceneImage.dataIndex(x, y)] = scene.traceRay(ray, 0).asRgbx()
pos = pos + 1 pos = pos + 1
proc render(): Image = proc render(): Image =