diff --git a/src/Scene.js b/src/Scene.js index a53cd5f..62bb3f2 100644 --- a/src/Scene.js +++ b/src/Scene.js @@ -27,7 +27,7 @@ window.id = 0 -export class Scene { +export default class Scene { constructor(store) { this.sid = 1 this.mid = 1 @@ -430,4 +430,4 @@ function addSketch() { return sketch } -// window.sc = new Scene(store) \ No newline at end of file +window.sce = new Scene(store) \ No newline at end of file diff --git a/src/Sketch.js b/src/Sketch.js index c9d7ec4..6e75cbe 100644 --- a/src/Sketch.js +++ b/src/Sketch.js @@ -329,7 +329,6 @@ class Sketch { this.scene.store.dispatch({ type: 'set-mode', mode }) } - // console.log('this mode:', this.scene.mode) } deleteSelected() { diff --git a/src/react/app.jsx b/src/react/app.jsx index 8197d1b..e08eaf2 100644 --- a/src/react/app.jsx +++ b/src/react/app.jsx @@ -36,13 +36,8 @@ const App = ({ store }) => { } -export let sce -document.addEventListener('DOMContentLoaded', async () => { - - const { Scene } = await import('../Scene') - sce = new Scene(store) - window.sc = sce +document.addEventListener('DOMContentLoaded', () => { ReactDOM.render(, document.getElementById('react')); diff --git a/src/react/depTree.js b/src/react/depTree.js index 8dcd21b..ce7cc92 100644 --- a/src/react/depTree.js +++ b/src/react/depTree.js @@ -1,4 +1,4 @@ -import {sce} from './app' +// import {sce} from './app' export class DepTree { constructor(obj) { diff --git a/src/react/dialog.jsx b/src/react/dialog.jsx index 55ddf2c..d81291e 100644 --- a/src/react/dialog.jsx +++ b/src/react/dialog.jsx @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'react-redux' import { MdDone, MdClose } from 'react-icons/md' import * as Icon from "./icons"; -import { sce } from './app' +// import { sce } from './app' export const Dialog = () => { diff --git a/src/react/dropDown.jsx b/src/react/dropDown.jsx index 93c0750..b74d7dc 100644 --- a/src/react/dropDown.jsx +++ b/src/react/dropDown.jsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import { useDispatch} from 'react-redux' -import { sce } from './app' +// import { sce } from './app' const utf8decoder = new TextDecoder(); diff --git a/src/react/fileHelpers.js b/src/react/fileHelpers.js index d2792d1..358aa84 100644 --- a/src/react/fileHelpers.js +++ b/src/react/fileHelpers.js @@ -10,7 +10,7 @@ import { fileSave, } from 'browser-fs-access'; -import { sce } from './app' +// import { sce } from './app' // https://web.dev/file-system-access/ diff --git a/src/react/navBar.jsx b/src/react/navBar.jsx index 57ed0a9..c87fe98 100644 --- a/src/react/navBar.jsx +++ b/src/react/navBar.jsx @@ -12,9 +12,9 @@ import { Dialog } from './dialog' import { DropDown } from './dropDown' import { STLExport, saveFile, openFile } from './fileHelpers' -import { drawClear } from '../drawEvents' +// import { drawClear } from '../drawEvents' -import { sce } from './app' +// import { sce } from './app' @@ -121,7 +121,7 @@ export const NavBar = () => { const sketchModeButtons = [ [Icon.Extrude, () => { - drawClear.call(sce.activeSketch) + // drawClear.call(sce.activeSketch) dispatch({ type: 'set-dialog', action: 'extrude', target: sce.activeSketch.obj3d.name }) }, 'Extrude'], [Icon.Line, () => sce.activeSketch.command('line'), 'Line (L)'], //1 diff --git a/src/react/reducer.js b/src/react/reducer.js index 3a445bb..93101ae 100644 --- a/src/react/reducer.js +++ b/src/react/reducer.js @@ -3,7 +3,7 @@ import { DepTree } from './depTree' import update from 'immutability-helper' import { combineReducers } from 'redux'; -import { sce } from './app' +// import { sce } from './app' const defaultTreeState = { byId: {}, diff --git a/src/react/tree.jsx b/src/react/tree.jsx index 3b2aed3..539f54f 100644 --- a/src/react/tree.jsx +++ b/src/react/tree.jsx @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'react-redux' import { MdEdit, MdVisibility, MdDelete } from 'react-icons/md' import { FaCube, FaDrawPolygon } from 'react-icons/fa' -import { sce } from './app' +// import { sce } from './app' export const Tree = () => { const treeEntries = useSelector(state => state.treeEntries) diff --git a/static/index.html b/static/index.html index d0d49c6..1ade562 100644 --- a/static/index.html +++ b/static/index.html @@ -23,7 +23,7 @@
- + diff --git a/webpack.common.js b/webpack.common.js index 79720c1..6198b66 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -5,7 +5,7 @@ const tailwindcss = require('tailwindcss') module.exports = { entry: { app: './src/react/app.jsx', - // scene: './src/Scene.js', + scene: './src/Scene.js', }, output: { filename: '[name].bundle.js',