mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-19 16:15:04 +00:00
supress error for process env, added vscode setting to gitignore segrgate enums (#369) Co-authored-by: Christopher Oliphant <RALifeCoach@users.noreply.github.com> Refactor storybook (#370) Co-authored-by: Christopher Oliphant <RALifeCoach@users.noreply.github.com> button dropdown docs (#372) storybook doc for button dropdown component refactor side panel tabs (#371) Co-authored-by: Christopher Oliphant <RALifeCoach@users.noreply.github.com> fix enums (#373) Co-authored-by: Christopher Oliphant <RALifeCoach@users.noreply.github.com> Refactoring Auth Context to Signals (#374) - file restructure, store -> signals - rewrite AuthContext to signals, and get rid of AuthContext - modify all files that need to use AuthContext to use the authentication Signal - the complex login persistency logic is now just a persistLogin function ran at root! - fetchers uses the auth signal directly to get the sessionToken - components no longer useSignals for these fetchers, hence decoupled from the auth signals !! components and fetchers that are definitely subjected to refactor does not receive the useSignal decoupling treatment Co-authored-by: wil <wil@storyteller.ai> Refactoring Toaster Context to a Toaster Component + Signal (#378) - Created the Toaster Component - Created the Toasts Signal - Now no useContext is needed for Toast Poping, nor passing AddToast around - Simply import addToast from the Signals and you can pop a toast from anywhere in the codebase Co-authored-by: wil <wil@storyteller.ai> Refactoring AppUi Context (partial: delete unused, editorLoader becomes signal) (#379) - dialogueTTS is unused, hence deleted - view side-by-side mode is unused, hence deleted - timeline height in this context was already made into signal, hence deleted - editorLoader in this context is now made into a page level signal, hence deleted - components and dispatcher of the editorLoader are modified to use signal instead - app level reducer is no longer used, tugged into context folder to avoid confusion, will be deleted when all attributes in AppUi context is refactored into signals Co-authored-by: wil <wil@storyteller.ai> Refactor control panel (#391) - control panel - simplified and improved - Please also test it. It operates slightly differently. For example, if the user types an invalid character, the character is ignored. --------- Co-authored-by: Christopher Oliphant <RALifeCoach@users.noreply.github.com> Refactoring App Level Components - Components that are in the /app/component folder are split into reusable and signaled - reusable are in theory signal independent - signaled are dependent on signals (and maybe a use-once component) - some app level components has page level enums or signals, those are bumped to app level now - all components in the module directory are moved into the component directories depending on whether it's reusable or signaled - code changes in are mostly just import changes to get re-target to get the correct files - discovered a small bug in FilterButtons and is fixed - whether a component need more work, it is commented on the index file that import them into the grand collection of components Refactor - Signals Part 2 - store is renamed to signals in PageEditor for clarity - ObjectControlPanel now uses a Signal instead of the AppUiContext - Moved EditorContext to Page Level, all context are page level only now - editor is modified to read and use signals directly (for now), this includes: -- the ObjectPanel signal -- the Scene signal -- the Authentication signal - and hence, editor now has a constructor doesn't require any arguments - editor also has a simple initialization - AppUiContext is retired completely and deleted --------- Co-authored-by: wil <wil@storyteller.ai> Co-authored-by: Christopher Oliphant <RALifeCoach@users.noreply.github.com>
82 lines
2.6 KiB
TypeScript
82 lines
2.6 KiB
TypeScript
import * as THREE from "three";
|
|
|
|
// from here https://wejn.org/2020/12/cracking-the-threejs-object-fitting-nut/
|
|
|
|
export const fitCameraToCenteredObject = function (
|
|
camera: THREE.PerspectiveCamera,
|
|
object: THREE.Object3D<THREE.Object3DEventMap>,
|
|
offset?: number,
|
|
orbitControls?,
|
|
) {
|
|
const boundingBox = new THREE.Box3();
|
|
boundingBox.setFromObject(object);
|
|
|
|
const size = new THREE.Vector3();
|
|
boundingBox.getSize(size);
|
|
|
|
// figure out how to fit the box in the view:
|
|
// 1. figure out horizontal FOV (on non-1.0 aspects)
|
|
// 2. figure out distance from the object in X and Y planes
|
|
// 3. select the max distance (to fit both sides in)
|
|
//
|
|
// The reason is as follows:
|
|
//
|
|
// Imagine a bounding box (BB) is centered at (0,0,0).
|
|
// Camera has vertical FOV (camera.fov) and horizontal FOV
|
|
// (camera.fov scaled by aspect, see fovh below)
|
|
//
|
|
// Therefore if you want to put the entire object into the field of view,
|
|
// you have to compute the distance as: z/2 (half of Z size of the BB
|
|
// protruding towards us) plus for both X and Y size of BB you have to
|
|
// figure out the distance created by the appropriate FOV.
|
|
//
|
|
// The FOV is always a triangle:
|
|
//
|
|
// (size/2)
|
|
// +--------+
|
|
// | /
|
|
// | /
|
|
// | /
|
|
// | F° /
|
|
// | /
|
|
// | /
|
|
// | /
|
|
// |/
|
|
//
|
|
// F° is half of respective FOV, so to compute the distance (the length
|
|
// of the straight line) one has to: `size/2 / Math.tan(F)`.
|
|
//
|
|
// FTR, from https://threejs.org/docs/#api/en/cameras/PerspectiveCamera
|
|
// the camera.fov is the vertical FOV.
|
|
|
|
const fov = camera.fov * (Math.PI / 180);
|
|
const fovh = 2 * Math.atan(Math.tan(fov / 2) * camera.aspect);
|
|
const dx = size.z / 2 + Math.abs(size.x / 2 / Math.tan(fovh / 2));
|
|
const dy = size.z / 2 + Math.abs(size.y / 2 / Math.tan(fov / 2));
|
|
let cameraZ = Math.max(dx, dy);
|
|
|
|
// offset the camera, if desired (to avoid filling the whole canvas)
|
|
if (offset !== undefined && offset !== 0) cameraZ *= offset;
|
|
|
|
camera.position.set(
|
|
0,
|
|
0.75, // this centers it vertically enough while testing, but probably needs to be dynamic
|
|
cameraZ,
|
|
);
|
|
|
|
// set the far plane of the camera so that it easily encompasses the whole object
|
|
const minZ = boundingBox.min.z;
|
|
const cameraToFarEdge = minZ < 0 ? -minZ + cameraZ : cameraZ - minZ;
|
|
|
|
camera.far = cameraToFarEdge * 3;
|
|
camera.updateProjectionMatrix();
|
|
|
|
if (orbitControls !== undefined) {
|
|
// set camera to rotate around the center
|
|
orbitControls.target = new THREE.Vector3(0, 0, 0);
|
|
|
|
// prevent camera from zooming out far enough to create far plane cutoff
|
|
orbitControls.maxDistance = cameraToFarEdge * 2;
|
|
}
|
|
};
|