Refactoring

Author: vojtatom

README.md

@@ -23,40 +23,42 @@ Currently:
 -   GLTF (triangles only)
 
 ## Roadmap
-- [x] Grid in the background
-- [x] Translucent models to see wirefame in the background
-- [x] Snap vertices
-- [x] Translation - scale - rotate
-- [x] Split models
-- [x] Hide models
-- [x] Delete model
-- [x] Loading SHP - *needs our own library to load, noone supports multipatch*
-- [x] BVH build into worker
-- [x] Loading screen + Add chicken
-- [x] Add React Context
-- [x] Tabs in sidepanel
-- [x] Redesign
-- [x] Sidepanel view settings
-- [x] Intro screen
-- [x] Selecting alignment for loaded models
-- [x] Worker pool for loading
-- [x] Status - counter, update global loading status
-- [x] Reading metadata from IFC files  - inspeciton of metadata?
-- [x] CI na githubu autodeploy
-
-### Short term
-- [ ] Loading points and lines from SHP
-- [ ] Loading GeoJSON
-- [ ] Project export
-- [ ] Project import
-- [ ] Allow labeling geometry
-- [ ] Uniforms copy on model add
-- [ ] Rotate Splash screen bug
+
+-   [x] Grid in the background
+-   [x] Translucent models to see wirefame in the background
+-   [x] Snap vertices
+-   [x] Translation - scale - rotate
+-   [x] Split models
+-   [x] Hide models
+-   [x] Delete model
+-   [x] Loading SHP - _needs our own library to load, noone supports multipatch_
+-   [x] BVH build into worker
+-   [x] Loading screen + Add chicken
+-   [x] Add React Context
+-   [x] Tabs in sidepanel
+-   [x] Redesign
+-   [x] Sidepanel view settings
+-   [x] Intro screen
+-   [x] Selecting alignment for loaded models
+-   [x] Worker pool for loading
+-   [x] Status - counter, update global loading status
+-   [x] Reading metadata from IFC files - inspeciton of metadata?
+-   [x] CI na githubu autodeploy
+-   [x] Uniforms copy on model add
+-   [x] Rotate Splash screen bug
+-   [ ] Loading points and lines from SHP
+-   [ ] Loading GeoJSON
+-   [ ] Project export
+-   [ ] Project import
+-   [ ] Allow labeling geometry
+-   [ ] delete selected submodel
+-   [ ] merge submodels
 
 ### Backlog
-- [ ] IFC metadata loading (memory-efficiency???)
-- [ ] BVH 
-- [ ] remesh models - intersection of triangles
-- [ ] delete submodel - *for now as (split + delete)*
-- [ ] frustum culling
-- [ ] rectangular select
+
+-   [ ] IFC metadata loading (memory-efficiency???)
+-   [ ] BVH
+-   [ ] remesh models - intersection of triangles
+-   [ ] delete submodel - _for now as (split + delete)_
+-   [ ] frustum culling
+-   [ ] rectangular select

src/Components/Editor/SidePanel/PanelViewSettings/Widgets/CameraGround.tsx

@@ -13,13 +13,6 @@ export function CameraGroundWidget() {
     if (!ctx) return null;
     const { renderer, activeView, camTargetZ, setCamTargetZ } = ctx;
 
-    const [upShortcut, setUpShortcut] = React.useState<GL.ShortcutOnPress>(
-        new GL.ShortcutOnPress('ArrowUp', () => {})
-    );
-    const [downShortcut, setDownShortcut] = React.useState<GL.ShortcutOnPress>(
-        new GL.ShortcutOnPress('ArrowDown', () => {})
-    );
-
     const updateCamTargetZ = (value: number) => {
         if (isNaN(value)) return;
 
@@ -28,24 +21,6 @@ export function CameraGroundWidget() {
         setCamTargetZ(value);
     };
 
-    React.useEffect(() => {
-        renderer.onInit = () => {
-            const controls = renderer.window.controls;
-            controls.addShortcut(upShortcut);
-            controls.addShortcut(downShortcut);
-        };
-    }, []);
-
-    React.useEffect(() => {
-        upShortcut.onTrigger = (view) => {
-            updateCamTargetZ(camTargetZ + 1);
-        };
-
-        downShortcut.onTrigger = (view) => {
-            updateCamTargetZ(camTargetZ - 1);
-        };
-    }, [camTargetZ]);
-
     return (
         <DetailWidget>
             <WidgetLine>

src/Utils/models/models/TriangleModel.ts

@@ -17,7 +17,7 @@ export class TriangleModel extends EditorModel {
 }
 
 export async function addTriangleModel(model: ModelData, ctx: EditorModelData) {
-    let { coordMode, globalShift, position, rotation, scale, selection, scene } = ctx;
+    let { coordMode, globalShift, position, rotation, scale, selection, scene, uniforms } = ctx;
 
     position = position || vec3.create();
     rotation = rotation || vec3.create();
@@ -56,8 +56,8 @@ export async function addTriangleModel(model: ModelData, ctx: EditorModelData) {
     glmodel.wireframeShader = wireframeShader;
     glmodel.data = model.metadata.data;
     glmodel.name = model.metadata.name;
-    //glmodel.uniforms = uniforms || DEFAULT_UNIFORMS; //TODO fix this, needs deep copy of the uniforms
-    glmodel.uniforms = DEFAULT_UNIFORMS;
+    if (uniforms) glmodel.uniforms = GL.cloneUniforms(uniforms);
+    else glmodel.uniforms = DEFAULT_UNIFORMS;
     glmodel.position = position.slice() as vec3;
     glmodel.rotation = rotation.slice() as vec3;
     glmodel.scale = scale.slice() as vec3;

src/bananagl/bananagl.ts

@@ -12,6 +12,7 @@ import { Renderer } from './renderer/renderer';
 import { mountRenderer, unmountRenderer } from './renderer/setup';
 import { Scene } from './scene/scene';
 import { Selection, SelectionManager } from './scene/selection';
+import { cloneUniforms } from './shaders/clone';
 import { Shader } from './shaders/shader';
 import { Profiler } from './utils/profiler';
 import { Shortcut, ShortcutOnMouseMove, ShortcutOnPress } from './window/shortcuts';
@@ -41,6 +42,7 @@ export {
     ShortcutOnMouseMove,
     mountRenderer,
     unmountRenderer,
+    cloneUniforms,
 };
 
 export type { Selectable, Shortcut };

src/bananagl/shaders/clone.ts

@@ -0,0 +1,27 @@
+import { UniformValue } from './shader';
+
+function isArray(a: any): a is any[] {
+    return Array.isArray(a);
+}
+
+export function cloneValue(value: UniformValue) {
+    //TODO optimize this to prevent reallocation
+    if (isArray(value)) return value.slice();
+    if (value instanceof Float32Array) return new Float32Array(value);
+    if (value instanceof Int32Array) return new Int32Array(value);
+    if (value instanceof Int16Array) return new Int16Array(value);
+    if (value instanceof Int8Array) return new Int8Array(value);
+    if (value instanceof Uint32Array) return new Uint32Array(value);
+    if (value instanceof Uint16Array) return new Uint16Array(value);
+    if (value instanceof Uint8Array) return new Uint8Array(value);
+    return value;
+}
+
+export function cloneUniforms(uniforms: { [name: string]: UniformValue }) {
+    const clone: { [name: string]: UniformValue } = {};
+    for (const name in uniforms) {
+        const value = uniforms[name];
+        clone[name] = cloneValue(value);
+    }
+    return clone;
+}

src/bananagl/shaders/shader.ts

@@ -1,5 +1,6 @@
 import equal from 'fast-deep-equal/es6';
 
+import { cloneValue } from './clone';
 import { handleErrors } from './errors';
 
 const VER = `#version 300 es
@@ -21,23 +22,6 @@ export type TypedArray =
 
 export type UniformValue = number | number[] | boolean | boolean[] | TypedArray | null;
 
-function isArray(a: any): a is any[] {
-    return Array.isArray(a);
-}
-
-function cloneValue(value: UniformValue) {
-    //TODO optimize this to prevent reallocation
-    if (isArray(value)) return value.slice();
-    if (value instanceof Float32Array) return new Float32Array(value);
-    if (value instanceof Int32Array) return new Int32Array(value);
-    if (value instanceof Int16Array) return new Int16Array(value);
-    if (value instanceof Int8Array) return new Int8Array(value);
-    if (value instanceof Uint32Array) return new Uint32Array(value);
-    if (value instanceof Uint16Array) return new Uint16Array(value);
-    if (value instanceof Uint8Array) return new Uint8Array(value);
-    return value;
-}
-
 const ROW_MAJOR = false;
 
 export class Shader {

src/bananagl/window/controls.ts

@@ -49,7 +49,6 @@ export class WindowControls {
     removeShortcut(shortcut: Shortcut) {
         const index = this.shortcuts_.indexOf(shortcut);
         if (index >= 0) {
-            //console.log('Shortcut removed', index, this.shortcuts_, shortcut);
             this.shortcuts_.splice(index, 1);
         } else {
             console.warn('Shortcut not found', this.shortcuts_, shortcut);
@@ -78,7 +77,6 @@ export class WindowControls {
         }
 
         this.downTime_ = Date.now();
-        //event.preventDefault();
     };
 
     onMouseMove = (event: MouseEvent) => {