Skip to content

Commit

Permalink
fix camera rotation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tumiz
Tumiz committed Apr 3, 2024
1 parent 70549ad commit ea526dd
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 10,675 deletions.
18 changes: 7 additions & 11 deletions docs/Color.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7674,19 +7674,18 @@ <h1 id="Color">Color<a class="anchor-link" href="#Color">¶</a></h1><p><strong>C
constructor(type, fovy, aspect, min, max) {
this.fovy = fovy
this.aspect = aspect
this.origin_center = [(min[0] + max[0]) / 2, (min[1] + max[1]) / 2, (min[2] + max[2]) / 2]
this.center = structuredClone(this.origin_center)
let ysize = Math.max((max[0] - min[0]) / this.aspect, max[1] - min[1]) * 1.1
this.origin_height = ysize / 2 / Math.tan(this.fovy / 2)
this.height = this.origin_height
this.origin_pose = mat.translation([(min[0] + max[0]) / 2, (min[1] + max[1]) / 2, (min[2] + max[2]) / 2 + this.height])
this.pose = structuredClone(this.origin_pose)
this.near = -0.1
this.far = -5 * Math.max(this.origin_height, max[2] - min[2])
this.rotation = mat.identity() // intrinsic
this.type = type
this.update_projection()
}
get position() {
return mat.add(mat.vm([0, 0, this.height], this.rotation).slice(0, 3), this.center)
return this.pose.slice(12, 15)
}
position_str() {
let p = this.position
Expand All @@ -7701,9 +7700,8 @@ <h1 id="Color">Color<a class="anchor-link" href="#Color">¶</a></h1><p><strong>C
this.height) : mat.perspective(this.fovy, this.aspect, this.near, this.far)
}
reset() {
this.pose = this.origin_pose
this.height = this.origin_height
this.center = this.origin_center
this.rotation = mat.identity()
this.update_projection()
}
resolution(width) {
Expand All @@ -7712,9 +7710,7 @@ <h1 id="Color">Color<a class="anchor-link" href="#Color">¶</a></h1><p><strong>C
}
world2ndc() {
return mat.mms(
mat.I(mat.translation(this.center)),
mat.I(this.rotation),
mat.I(mat.translation([0, 0, this.height])),
mat.I(this.pose),
this.projection)
}
}
Expand Down Expand Up @@ -7868,11 +7864,11 @@ <h1 id="Color">Color<a class="anchor-link" href="#Color">¶</a></h1><p><strong>C
let d = Math.hypot(dx, dy)
if (d) {
if (ev.ctrlKey | ev.buttons == 4) {
this.camera.rotation = mat.mm(mat.angle_axis(d / 100, dy / d, dx / d, 0), this.camera.rotation)
this.camera.pose = mat.mm(this.camera.pose, mat.angle_axis(d / 100, dy / d, dx / d, 0))
this.render()
} else if (ev.shiftKey | ev.buttons == 1) {
const ratio = this.camera.height / 200
this.camera.center = mat.add(this.camera.center, mat.vm([-dx * ratio, dy * ratio, 0], this.camera.rotation))
this.camera.pose = mat.mm(this.camera.pose, mat.translation([-dx * ratio, dy * ratio, 0]))
this.render()
}
this.toolbar.tooltip.innerHTML = this.camera.position_str()
Expand Down
38 changes: 17 additions & 21 deletions docs/Rotation.html
View file

Large diffs are not rendered by default.

46 changes: 21 additions & 25 deletions docs/Transform.html
View file

Large diffs are not rendered by default.

67 changes: 33 additions & 34 deletions docs/Vector.html
View file

Large diffs are not rendered by default.

86 changes: 41 additions & 45 deletions docs/Vector3.html
View file

Large diffs are not rendered by default.

18 changes: 7 additions & 11 deletions docs/Vector4.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7674,19 +7674,18 @@ <h1 id="Vector4">Vector4<a class="anchor-link" href="#Vector4">¶</a></h1>
constructor(type, fovy, aspect, min, max) {
this.fovy = fovy
this.aspect = aspect
this.origin_center = [(min[0] + max[0]) / 2, (min[1] + max[1]) / 2, (min[2] + max[2]) / 2]
this.center = structuredClone(this.origin_center)
let ysize = Math.max((max[0] - min[0]) / this.aspect, max[1] - min[1]) * 1.1
this.origin_height = ysize / 2 / Math.tan(this.fovy / 2)
this.height = this.origin_height
this.origin_pose = mat.translation([(min[0] + max[0]) / 2, (min[1] + max[1]) / 2, (min[2] + max[2]) / 2 + this.height])
this.pose = structuredClone(this.origin_pose)
this.near = -0.1
this.far = -5 * Math.max(this.origin_height, max[2] - min[2])
this.rotation = mat.identity() // intrinsic
this.type = type
this.update_projection()
}
get position() {
return mat.add(mat.vm([0, 0, this.height], this.rotation).slice(0, 3), this.center)
return this.pose.slice(12, 15)
}
position_str() {
let p = this.position
Expand All @@ -7701,9 +7700,8 @@ <h1 id="Vector4">Vector4<a class="anchor-link" href="#Vector4">¶</a></h1>
this.height) : mat.perspective(this.fovy, this.aspect, this.near, this.far)
}
reset() {
this.pose = this.origin_pose
this.height = this.origin_height
this.center = this.origin_center
this.rotation = mat.identity()
this.update_projection()
}
resolution(width) {
Expand All @@ -7712,9 +7710,7 @@ <h1 id="Vector4">Vector4<a class="anchor-link" href="#Vector4">¶</a></h1>
}
world2ndc() {
return mat.mms(
mat.I(mat.translation(this.center)),
mat.I(this.rotation),
mat.I(mat.translation([0, 0, this.height])),
mat.I(this.pose),
this.projection)
}
}
Expand Down Expand Up @@ -7868,11 +7864,11 @@ <h1 id="Vector4">Vector4<a class="anchor-link" href="#Vector4">¶</a></h1>
let d = Math.hypot(dx, dy)
if (d) {
if (ev.ctrlKey | ev.buttons == 4) {
this.camera.rotation = mat.mm(mat.angle_axis(d / 100, dy / d, dx / d, 0), this.camera.rotation)
this.camera.pose = mat.mm(this.camera.pose, mat.angle_axis(d / 100, dy / d, dx / d, 0))
this.render()
} else if (ev.shiftKey | ev.buttons == 1) {
const ratio = this.camera.height / 200
this.camera.center = mat.add(this.camera.center, mat.vm([-dx * ratio, dy * ratio, 0], this.camera.rotation))
this.camera.pose = mat.mm(this.camera.pose, mat.translation([-dx * ratio, dy * ratio, 0]))
this.render()
}
this.toolbar.tooltip.innerHTML = this.camera.position_str()
Expand Down
22 changes: 9 additions & 13 deletions docs/index.html
View file

Large diffs are not rendered by default.

Loading

0 comments on commit ea526dd

Please sign in to comment.