Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switched back to parabolic lenses #4

Merged
merged 5 commits into from
Jul 20, 2024
Merged

Switched back to parabolic lenses #4

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cffb52
trying to work on correct lenses
Elixonus Jul 20, 2024
3707e0f
not working atm
Elixonus Jul 20, 2024
eb22e6e
trouble with lenses but mvp
Elixonus Jul 20, 2024
6a49ff1
fixed naming and small bug
Elixonus Jul 20, 2024
0da72d6
switched back to parabolic lenses
Elixonus Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 31 additions & 27 deletions optics/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,10 @@ class Scene {
// form a new array of collisions copy with an additional new closest interaction
let newCollisions = structuredClone(collisions);

for (let n = 0; n < newCollisions.length; n++) {
newCollisions[n].position = new Point(newCollisions[n].position.x, newCollisions[n].position.y);
}

if (closestMirror === undefined) {
// if no collisions are found, add a final laser light point into the void
newCollisions.push({
Expand Down Expand Up @@ -1029,28 +1033,28 @@ class Mirror extends DraggableObject {

/**
* set the vertices of the polygon to match the shape of a concave mirror
* xLength and yLength are the width and height of the concave mirror (respectively)
* width and height are the width and height of the concave mirror (respectively)
*/
makeConcaveMirror(focalLength, yLength, xLength, vertexCount) {
makeConcaveMirror(focalLength, height, width, vertexCount) {
this.vertices = [];

for (let n = 0; n < vertexCount - 2; n++) {
let x = (n / (vertexCount - 3) - 0.5) * yLength;
let x = (n / (vertexCount - 3) - 0.5) * height;
this.vertices.push(new Point(Math.pow(x, 2) / (4 * focalLength), x));
}

let rightMost = this.getExtremes().rightMost.clone();
this.vertices.push(new Point(rightMost.x - xLength, yLength / 2), new Point(rightMost.x - xLength, -yLength / 2));
this.vertices.push(new Point(rightMost.x - width, height / 2), new Point(rightMost.x - width, -height / 2));
this.closedShape = true;
return this;
}

/**
* set the vertices of the polygon to match the shape of a convex mirror
* yLength is the height of the convex mirror
* height is the height of the convex mirror
*/
makeConvexMirror(focalLength, yLength, vertexCount) {
this.makeConcaveMirror(focalLength, yLength, 0, vertexCount + 2);
makeConvexMirror(focalLength, height, vertexCount) {
this.makeConcaveMirror(focalLength, height, 0, vertexCount + 2);
this.vertices.pop();
this.vertices.pop();
let rightMost = this.getExtremes().rightMost.clone();
Expand All @@ -1065,39 +1069,39 @@ class Mirror extends DraggableObject {
}

/**
* set the vertices of the polygon to match the shape of convex lens
* yLength is the height of the convex lens
* set the vertices of the polygon to match the shape of a concave lens
* width and height are the width and height of the concave lens (respectively)
* need help with creating correct geometry of lenses
*/
makeConvexLens(curvatureRadius, yLength, vertexCount, switchType = true) {
this.makeConvexMirror(curvatureRadius, yLength, Math.round((vertexCount + 2) / 2));
makeConcaveLens(curvatureRadius, height, width, vertexCount) {
this.makeConvexMirror(curvatureRadius, height, vertexCount);
let leftMost = this.getExtremes().leftMost.clone();

for (let n = this.vertices.length - 2; n >= 1; n--) {
for (let n = 0; n < this.vertices.length; n++) {
let vertex = this.vertices[n];
this.vertices.push(new Point(-vertex.x, vertex.y));
vertex.x += -width / 2 + leftMost.x;
}

for (let n = this.vertices.length - 1; n >= 0; n--) {
let vertex = this.vertices[n];
this.vertices.push(new Point(-(vertex.x + leftMost.x) - leftMost.x - height / 60, vertex.y));
}

this.closedShape = true;
return this;
}

/**
* set the vertices of the polygon to match the shape of a concave lens
* xLength and yLength are the width and height of the concave lens (respectively)
* set the vertices of the polygon to match the shape of convex lens
* height is the height of the convex lens
* need help with creating correct geometry of lenses
*/
makeConcaveLens(curvatureRadius, yLength, xLength, vertexCount) {
this.makeConvexMirror(curvatureRadius, yLength, vertexCount);
let leftMost = this.getExtremes().leftMost.clone();
makeConvexLens(curvatureRadius, height, vertexCount) {
this.makeConvexMirror(curvatureRadius, height, Math.round((vertexCount + 2) / 2));

for (let n = 0; n < this.vertices.length; n++) {
let vertex = this.vertices[n];
vertex.x += -xLength / 2 + leftMost.x;
}

for (let n = this.vertices.length - 1; n >= 0; n--) {
for (let n = this.vertices.length - 2; n >= 1; n--) {
let vertex = this.vertices[n];
this.vertices.push(new Point(-(vertex.x + leftMost.x) - leftMost.x - yLength / 60, vertex.y));
this.vertices.push(new Point(-vertex.x, vertex.y));
}

this.closedShape = true;
Expand Down Expand Up @@ -1973,7 +1977,7 @@ function loadExample(n) {
new Laser(new Point(-100, 200), 0),
]);
let parabola4 = new Mirror(Mirror.refracting(1.5), new Point(300, 0), 0);
parabola4.makeConcaveLens(200, 600, 300, 200);
parabola4.makeConcaveLens(200, 600, 310, 400);
scene.addMirror(parabola4);
break;
case 8:
Expand All @@ -1985,7 +1989,7 @@ function loadExample(n) {
new Laser(new Point(-100, 200), 0),
]);
let parabola3 = new Mirror(Mirror.refracting(1.5), new Point(300, 0), 0);
parabola3.makeConvexLens(500, 600, 200);
parabola3.makeConvexLens(200, 600, 400);
scene.addMirror(parabola3);
break;
case 9:
Expand Down
Loading