Miroirs/pixelfaucet
1
0
Fork 0
mirror of https://github.com/SleepingInsomniac/pixelfaucet synced 2025-01-31 19:57:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix inverted y axis

Browse source
This commit is contained in:
Alex Clink 2021-12-12 23:42:58 -05:00
parent 1164cf50d6
commit 1a7f4e45c6
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
examples/cube.cr
View file

@ -9,8 +9,9 @@ struct Vec3d(T)
property x : T property x : T
property y : T property y : T
property z : T property z : T
property w : T
def initialize(@x : T, @y : T, @z : T) def initialize(@x : T, @y : T, @z : T, @w = T.new(1))
end end
def +(other : T) def +(other : T)
@ -201,25 +202,19 @@ class Model
@mat_rx = Mat4.new @mat_rx = Mat4.new
@mat_ry = Mat4.new @mat_ry = Mat4.new
@mat_rz = Mat4.new @mat_rz = Mat4.new
@mat_translation = Mat4.new
def initialize(obj : String) def initialize(obj : String)
@mesh = Mesh.load(obj) @mesh = Mesh.load(obj)
end end
def update(dt : Float64) def update(dt : Float64)
coz = Math.cos(@rotation.z)
siz = Math.sin(@rotation.z)
cox = Math.cos(@rotation.x) cox = Math.cos(@rotation.x)
sox = Math.sin(@rotation.x) sox = Math.sin(@rotation.x)
coy = Math.cos(@rotation.y) coy = Math.cos(@rotation.y)
soy = Math.sin(@rotation.y) soy = Math.sin(@rotation.y)
coz = Math.cos(@rotation.z)
@mat_rz.set({ siz = Math.sin(@rotation.z)
{coz, siz, 0.0, 0.0},
{-siz, coz, 0.0, 0.0},
{0.0, 0.0, 1.0, 0.0},
{0.0, 0.0, 0.0, 1.0},
})
@mat_rx.set({ @mat_rx.set({
{1.0, 0.0, 0.0, 0.0}, {1.0, 0.0, 0.0, 0.0},
@ -234,6 +229,20 @@ class Model
{-soy, 0.0, coy, 0.0}, {-soy, 0.0, coy, 0.0},
{0.0, 0.0, 0.0, 1.0}, {0.0, 0.0, 0.0, 1.0},
}) })
@mat_rz.set({
{coz, siz, 0.0, 0.0},
{-siz, coz, 0.0, 0.0},
{0.0, 0.0, 1.0, 0.0},
{0.0, 0.0, 0.0, 1.0},
})
@mat_translation.set({
{1.0, 0.0, 0.0, 0.0},
{0.0, 1.0, 0.0, 0.0},
{0.0, 0.0, 1.0, 0.0},
{@position.x, @position.y, @position.z, 1.0},
})
end end
def draw(engine : PF::Game, mat_proj, camera, light) def draw(engine : PF::Game, mat_proj, camera, light)
@ -242,10 +251,7 @@ class Model
tri *= @mat_rx tri *= @mat_rx
tri *= @mat_ry tri *= @mat_ry
tri *= @mat_rz tri *= @mat_rz
tri *= @mat_translation
tri.p1.z = tri.p1.z + 6.0
tri.p2.z = tri.p2.z + 6.0
tri.p3.z = tri.p3.z + 6.0
tri tri
end end
@ -256,10 +262,10 @@ class Model
end end
# sort triangles # sort triangles
tris = tris.sort { |a, b| b.z <=> a.z } tris = tris.sort { |a, b| a.z <=> b.z }
tris.each do |tri| tris.each do |tri|
shade : UInt8 = (tri.normal.dot(light) * 255.0).clamp(0.0..255.0).to_u8 shade : UInt8 = (tri.normal.dot(light).abs * 255.0).clamp(0.0..255.0).to_u8
tri.p1 *= mat_proj tri.p1 *= mat_proj
tri.p2 *= mat_proj tri.p2 *= mat_proj
@ -302,6 +308,7 @@ class CubeGame < PF::Game
super(@width, @height, @scale) super(@width, @height, @scale)
@cube = Model.new("examples/cube.obj") @cube = Model.new("examples/cube.obj")
@cube.position.z = @cube.position.z - 3.0
@controller = PF::Controller(LibSDL::Keycode).new({ @controller = PF::Controller(LibSDL::Keycode).new({
LibSDL::Keycode::RIGHT => "Rotate Right", LibSDL::Keycode::RIGHT => "Rotate Right",
@ -349,7 +356,6 @@ class CubeGame < PF::Game
end end
unless @paused unless @paused
@theta += dt
@cube.rotation.y = @cube.rotation.y + 1.0 * dt @cube.rotation.y = @cube.rotation.y + 1.0 * dt
end end