max/karl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: implement simple distortion fix

Browse Source
This commit is contained in:
max_richter 2021-03-10 14:24:50 +01:00
parent 578ee0d3fa
commit 3a69f43f23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/public/worker.js
View File

@ -28,7 +28,9 @@ self.addEventListener('message', function (e) {
const y = Math.floor(i / width); const y = Math.floor(i / width);
// KarlKilian Formel // KarlKilian Formel
const pixelValue = Math.cos(360 / (Math.pow(height, 2)) * Math.pow(y, 2) + (-360 / height) * y + 90); //const pixelValue = Math.cos(360 / (Math.pow(height, 2)) * Math.pow(y, 2) + (-360 / height) * y + 90);
const pixelValue = (2 * Math.sqrt(y * (height - y))) / height;
oldStore[id] = oldStore[id] + 1 || 1; oldStore[id] = oldStore[id] + 1 || 1;

2
view/src/components/Editor/OrbView.ts
View File

@ -1,6 +1,6 @@
import { Renderer, Camera, Transform, Texture, Sphere, Program, Mesh } from "ogl" import { Renderer, Camera, Transform, Texture, Sphere, Program, Mesh } from "ogl"
import { Orbit } from "./CustomOrbit" import { Orbit } from "./CustomOrbit"
import { bufToImageUrl } from "helpers"; import { bufToImageUrl } from "../../helpers";
import VertexShader from "./Orb.vert"; import VertexShader from "./Orb.vert";

12
view/src/components/Editor/Painter.svelte
View File

@ -46,6 +46,7 @@
let downX, downOffset; let downX, downOffset;
let debugValue = 0; let debugValue = 0;
let debugY = 0;
let isStrPressed = false; let isStrPressed = false;
let isSpacePressed = false; let isSpacePressed = false;
@ -155,14 +156,11 @@
isOriginal = e.target.id === "cx1"; isOriginal = e.target.id === "cx1";
//Caclulate y position of pixel //Caclulate y position of pixel
const y = my / wrapperHeightRatio; const y = Math.floor(my * wrapperHeightRatio);
debugY = y;
// KarlKilian Formel // KarlKilian Formel
debugValue = Math.cos( debugValue = (2 * Math.sqrt(y * (image.height - y))) / image.height;
(360 / Math.pow(image.height, 2)) * Math.pow(y, 2) +
(-360 / image.height) * y +
90
);
if (isDown) { if (isDown) {
if (activeTool === "pan") { if (activeTool === "pan") {
@ -303,7 +301,7 @@
}%)); opacity: ${(layerOpacity / 100) * 0.5};`} }%)); opacity: ${(layerOpacity / 100) * 0.5};`}
/> />
<p>{debugValue}|{my}</p> <p>h:{image.height} | y:{debugY} | value:{debugValue}</p>
<canvas class:visible={mode === "3d"} bind:this={canvas3D} /> <canvas class:visible={mode === "3d"} bind:this={canvas3D} />
</div> </div>