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.

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

Introducing GUI Editor into Master #9609

Merged
merged 85 commits into from
Jan 6, 2021
Merged
Show file tree
Hide file tree
Changes from 77 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
ad7010b
creating folder for gui editor
PicklesMcPickle Oct 19, 2020
3ba1b74
creating gui editor
PicklesMcPickle Oct 28, 2020
a496df8
removing extra ui on side bars
PicklesMcPickle Oct 29, 2020
c153293
trying to render gui canvas
PicklesMcPickle Oct 30, 2020
5eac45e
testing new branch
PicklesMcPickle Oct 30, 2020
da80e2d
rendering button
PicklesMcPickle Oct 30, 2020
0433958
commiting
PicklesMcPickle Nov 1, 2020
1e12dab
pushing
PicklesMcPickle Nov 2, 2020
45d89d7
creating new guiNode file
PicklesMcPickle Nov 2, 2020
9ecdd4a
hooking up clicking the ui element
PicklesMcPickle Nov 2, 2020
d4a3fdb
getting clickable gui element
PicklesMcPickle Nov 3, 2020
0cb7348
basic button inputs
PicklesMcPickle Nov 3, 2020
3fc4c23
selection
PicklesMcPickle Nov 3, 2020
42c6455
dragging sort of
PicklesMcPickle Nov 4, 2020
83d552b
Add color picker
nadaOuf Nov 5, 2020
320d89a
Merge pull request #1 from nadaOuf/msDestiny14/gui
msDestiny14 Nov 5, 2020
6048e63
update
PicklesMcPickle Nov 5, 2020
e635566
Create properties for slider and add slider entry in the left panel
nadaOuf Nov 6, 2020
4aff2e6
Merge pull request #2 from nadaOuf/msDestiny14/gui
msDestiny14 Nov 6, 2020
8b941bb
working on exporting
PicklesMcPickle Nov 6, 2020
f8cc307
more progress to exporting
PicklesMcPickle Nov 9, 2020
3f7aa82
deleteing code
PicklesMcPickle Nov 16, 2020
3e765f0
deleteing code
PicklesMcPickle Nov 16, 2020
4bdc6ba
deleteing code
PicklesMcPickle Nov 17, 2020
0b6af8d
deleteing code
PicklesMcPickle Nov 17, 2020
d54aa8d
deleteing code
PicklesMcPickle Nov 17, 2020
7af70c9
deleteing code
PicklesMcPickle Nov 19, 2020
e90a7e5
deleteing code
PicklesMcPickle Nov 19, 2020
fb09811
deleteing code
PicklesMcPickle Nov 19, 2020
070ee45
fixing bug
PicklesMcPickle Nov 19, 2020
7d73a23
adding delete
PicklesMcPickle Nov 24, 2020
181f9f1
fixing render loop
msDestiny14 Dec 1, 2020
5dadcad
changing workbench name
msDestiny14 Dec 1, 2020
066a4d0
renaming to GUINode
msDestiny14 Dec 1, 2020
f49b101
working on guiNode
msDestiny14 Dec 1, 2020
f01f342
adding better way for inserting new guis
msDestiny14 Dec 2, 2020
3f318dc
getting grid scrolling
msDestiny14 Dec 2, 2020
8ad5af9
removing warnings
msDestiny14 Dec 2, 2020
e919a1d
adding new gui elements
msDestiny14 Dec 2, 2020
74793e0
adding line
msDestiny14 Dec 2, 2020
ccd798f
adding more controls
msDestiny14 Dec 3, 2020
392f445
merging
msDestiny14 Dec 4, 2020
09e4cdc
changing editor name
msDestiny14 Dec 4, 2020
49200ea
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js into…
msDestiny14 Dec 11, 2020
b3cff35
merge?
msDestiny14 Dec 11, 2020
f310c79
changing name to gui-editor
msDestiny14 Dec 11, 2020
46d1d9b
changing to workbenchEditor
msDestiny14 Dec 11, 2020
d5c019e
working on selection
msDestiny14 Dec 14, 2020
2f2d9ce
removing code
msDestiny14 Dec 14, 2020
50ea55d
removing code
msDestiny14 Dec 14, 2020
86e7047
removing code
msDestiny14 Dec 14, 2020
9fcfb9b
fixing selection bug
msDestiny14 Dec 15, 2020
4c0484e
removing extra files
msDestiny14 Dec 15, 2020
02b2297
cleaning code
msDestiny14 Dec 15, 2020
aeb2efc
cleaning code
msDestiny14 Dec 16, 2020
e524add
cleaning code
msDestiny14 Dec 16, 2020
0378cac
comment change
msDestiny14 Dec 16, 2020
c2422ba
removing UI files
msDestiny14 Dec 16, 2020
7f73e22
removing more files
msDestiny14 Dec 16, 2020
7c19c10
removing files
msDestiny14 Dec 16, 2020
c55749c
removing extra shared ui
msDestiny14 Dec 16, 2020
8094672
removing not needed icons
msDestiny14 Dec 16, 2020
3e59328
removing errors
msDestiny14 Dec 16, 2020
940f210
removing errors
msDestiny14 Dec 16, 2020
26b05fc
readding shared ui globally
msDestiny14 Dec 16, 2020
dbc11cb
removing shared UI
msDestiny14 Dec 16, 2020
4f7932f
adding preview release files
msDestiny14 Dec 16, 2020
d807c91
fixing easier comments made on PR, still working on shared UI fixed
msDestiny14 Dec 17, 2020
7cd5e82
fixing first sharded UI
msDestiny14 Dec 17, 2020
770b684
linking shared UI
msDestiny14 Dec 17, 2020
0b7506c
cleaning files
msDestiny14 Dec 17, 2020
3ac9cb4
running prettier
msDestiny14 Dec 17, 2020
b5b3a82
removing unused file
msDestiny14 Dec 17, 2020
ba2c988
moving file and adding to readme
msDestiny14 Dec 17, 2020
808f6e2
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js into…
msDestiny14 Dec 17, 2020
d1d462a
changing file type
msDestiny14 Dec 17, 2020
8fc0b08
fixing typo
msDestiny14 Dec 17, 2020
1b8440c
removing nme code
msDestiny14 Jan 4, 2021
eaa687d
cleaning for PR
msDestiny14 Jan 4, 2021
336b638
cleaning more code
msDestiny14 Jan 5, 2021
33d8b3b
cleaning css
msDestiny14 Jan 5, 2021
fc95da8
removing extra code
msDestiny14 Jan 5, 2021
7ebf0bb
changing names
msDestiny14 Jan 5, 2021
89739fe
changing names
msDestiny14 Jan 5, 2021
ce70374
cleaning css
msDestiny14 Jan 5, 2021
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,4 @@ ktx2Decoder/dist/
# Symlinks
inspector/src/sharedUiComponents/**/*
nodeEditor/src/sharedUiComponents/**/*
guiEditor/src/sharedUiComponents/**/*
13 changes: 13 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch GUI Editor (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/guiEditor/public/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Viewer (Chrome)",
Expand Down
1 change: 1 addition & 0 deletions Playground/frame.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<script src="https://preview.babylonjs.com/guiEditor/babylon.guiEditor.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions Playground/full.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<script src="https://preview.babylonjs.com/guiEditor/babylon.guiEditor.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions Playground/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<script src="https://preview.babylonjs.com/guiEditor/babylon.guiEditor.js"></script>

<!-- Extensions -->
<script
Expand Down
1 change: 1 addition & 0 deletions Playground/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var Versions = {
"https://preview.babylonjs.com/gui/babylon.gui.min.js",
"https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js",
"https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js",
"https://preview.babylonjs.com/guiEditor/babylon.guiEditor.js",
"https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js",
"https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js",
"https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js",
Expand Down
61 changes: 59 additions & 2 deletions Tools/Config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"serializers",
"gui",
"inspector",
"nodeEditor"
"nodeEditor",
"guiEditor"
],
"es6modules": [
"core",
Expand All @@ -60,7 +61,8 @@
"gui",
"inspector",
"viewer",
"nodeEditor"
"nodeEditor",
"guiEditor"
],
"apps": [
"playground",
Expand Down Expand Up @@ -651,6 +653,61 @@
}
}
},
"guiEditor": {
"libraries": [
{
"output": "babylon.guiEditor.js",
"entry": "./legacy/legacy.ts"
}
],
"build": {
"ignoreInWorkerMode": true,
"ignoreInTestMode": true,
"mainFolder": "./guiEditor/",
"uncheckedLintImports": [
"react",
"react-dom",
"dagre",
"re-resizable",
"glTF",
"file-saver"
],
"sharedUiComponents": "src/sharedUiComponents/",
"umd": {
"packageName": "babylonjs-gui-editor",
"webpackRoot": "GUIEDITOR",
"processDeclaration": {
"filename": "babylon.guiEditor.module.d.ts",
"moduleName": "GUIEDITOR",
"importsToRemove": [],
"classMap": {
"babylonjs": "BABYLON",
"react": "React",
"@babylonjs/core": "BABYLON",
"@fortawesome": false,
"react-contextmenu": false
}
}
},
"es6": {
"webpackBuild": true,
"buildDependencies": [
"node_modules/re-resizable/lib/index.es5.js",
"Tools/**/*"
],
"packageName": "@babylonjs/gui-editor",
"readme": "dist/preview release/guiEditor/readme-es6.md",
"packagesFiles": [
"babylon.guiEditor.max.js",
"babylon.guiEditor.max.js.map",
"babylon.guiEditor.module.d.ts",
"readme.md"
],
"typings": "babylon.guiEditor.module.d.ts",
"index": "babylon.guiEditor.max.js"
}
}
},
"ktx2Decoder": {
"tempFileName": "babylon.ktx2Decoder.js",
"distFile": "/dist/preview release/babylon.ktx2Decoder.js",
Expand Down
Loading