sunrize 1.7.8 → 1.7.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +4 -4
- package/src/Controls/MaterialPreviewPopover.js +1 -0
- package/src/Controls/TexturePreviewPopover.js +1 -0
- package/src/Editors/MaterialsLibrary.js +1 -1
- package/src/Editors/Primitives.js +20 -0
- package/src/assets/html/window-template.html +2 -1
- package/src/assets/html/window.html +2 -1
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sunrize",
|
|
3
3
|
"productName": "Sunrize X3D Editor",
|
|
4
|
-
"version": "1.7.
|
|
4
|
+
"version": "1.7.10",
|
|
5
5
|
"description": "A Multi-Platform X3D Editor",
|
|
6
6
|
"main": "src/main.js",
|
|
7
7
|
"bin": {
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"docs": "cd docs && bundle exec jekyll serve --incremental --host=`ipconfig getifaddr en0`",
|
|
28
28
|
"docs-install": "cd docs && bundle install",
|
|
29
29
|
"docs-update": "cd docs && bundle update",
|
|
30
|
-
"
|
|
30
|
+
"merge-development": "sh build/merge-development.sh",
|
|
31
31
|
"make-x_ite-for-sunrize": "sh build/make-x_ite-for-sunrize.sh"
|
|
32
32
|
},
|
|
33
33
|
"repository": {
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
"jquery-ui-dist": "^1.13.3",
|
|
100
100
|
"jstree": "^3.3.16",
|
|
101
101
|
"material-icons": "^1.13.12",
|
|
102
|
-
"material-symbols": "^0.21.
|
|
102
|
+
"material-symbols": "^0.21.3",
|
|
103
103
|
"md5": "^2.3.0",
|
|
104
104
|
"mime-types": "^2.1.35",
|
|
105
105
|
"monaco-editor": "^0.50.0",
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"string-similarity": "^4.0.4",
|
|
110
110
|
"tweakpane": "^3.1.10",
|
|
111
111
|
"update-electron-app": "^3.0.0",
|
|
112
|
-
"x_ite": "^10.
|
|
112
|
+
"x_ite": "^10.2.0"
|
|
113
113
|
},
|
|
114
114
|
"config": {
|
|
115
115
|
"forge": {
|
|
@@ -23,6 +23,7 @@ $.fn.materialPreviewPopover = async function (node)
|
|
|
23
23
|
.attr ("contextMenu", false)
|
|
24
24
|
.attr ("notifications", false)
|
|
25
25
|
.attr ("colorSpace", node .getBrowser () .getBrowserOption ("ColorSpace"))
|
|
26
|
+
.attr ("xrSessionMode", "NONE")
|
|
26
27
|
.appendTo (preview);
|
|
27
28
|
|
|
28
29
|
const
|
|
@@ -47,6 +47,7 @@ $.fn.texturePreviewPopover = async function (node)
|
|
|
47
47
|
.attr ("contextMenu", false)
|
|
48
48
|
.attr ("notifications", false)
|
|
49
49
|
.attr ("colorSpace", node .getBrowser () .getBrowserOption ("ColorSpace"))
|
|
50
|
+
.attr ("xrSessionMode", "NONE")
|
|
50
51
|
.appendTo (preview);
|
|
51
52
|
|
|
52
53
|
const
|
|
@@ -29,7 +29,7 @@ module .exports = class Materials extends LibraryPane
|
|
|
29
29
|
.addClass ("library-list");
|
|
30
30
|
|
|
31
31
|
const
|
|
32
|
-
canvas = $("<x3d-canvas preserveDrawingBuffer='true'></x3d-canvas>"),
|
|
32
|
+
canvas = $("<x3d-canvas preserveDrawingBuffer='true' xrSessionMode='NONE'></x3d-canvas>"),
|
|
33
33
|
browser = canvas .prop ("browser"),
|
|
34
34
|
scene = await browser .createX3DFromURL (new X3D .MFString (`file://${__dirname}/Materials.x3d`));
|
|
35
35
|
|
|
@@ -360,6 +360,26 @@ DEF Sphere Transform {
|
|
|
360
360
|
geometry Sphere { }
|
|
361
361
|
}
|
|
362
362
|
}
|
|
363
|
+
`
|
|
364
|
+
},
|
|
365
|
+
{
|
|
366
|
+
componentInfo: { name: "Lighting" },
|
|
367
|
+
typeName: "EnvironmentLight",
|
|
368
|
+
x3dSyntax: `
|
|
369
|
+
EnvironmentLight {
|
|
370
|
+
diffuseTexture ImageCubeMapTexture {
|
|
371
|
+
url "https://create3000.github.io/Library/Tests/Components/images/helipad-diffuse.jpg"
|
|
372
|
+
textureProperties DEF _1 TextureProperties {
|
|
373
|
+
generateMipMaps TRUE
|
|
374
|
+
minificationFilter "NICEST"
|
|
375
|
+
magnificationFilter "NICEST"
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
specularTexture ImageCubeMapTexture {
|
|
379
|
+
url "https://create3000.github.io/Library/Tests/Components/images/helipad-specular.jpg"
|
|
380
|
+
textureProperties USE _1
|
|
381
|
+
}
|
|
382
|
+
}
|
|
363
383
|
`
|
|
364
384
|
},
|
|
365
385
|
{
|
|
@@ -15,11 +15,12 @@
|
|
|
15
15
|
<div id="browser-frame">
|
|
16
16
|
<x3d-canvas
|
|
17
17
|
id="browser"
|
|
18
|
+
debug="false"
|
|
18
19
|
cache="false"
|
|
19
20
|
preserveDrawingBuffer="true"
|
|
20
21
|
splashScreen="false"
|
|
21
22
|
contextMenu="false"
|
|
22
|
-
|
|
23
|
+
xrSessionMode="NONE"></x3d-canvas>
|
|
23
24
|
</div>
|
|
24
25
|
<div id="secondary-toolbar" class="toolbar vertical-toolbar large-toolbar secondary-toolbar"></div>
|
|
25
26
|
</div>
|
|
@@ -15,11 +15,12 @@
|
|
|
15
15
|
<div id="browser-frame">
|
|
16
16
|
<x3d-canvas
|
|
17
17
|
id="browser"
|
|
18
|
+
debug="false"
|
|
18
19
|
cache="false"
|
|
19
20
|
preserveDrawingBuffer="true"
|
|
20
21
|
splashScreen="false"
|
|
21
22
|
contextMenu="false"
|
|
22
|
-
|
|
23
|
+
xrSessionMode="NONE"></x3d-canvas>
|
|
23
24
|
</div>
|
|
24
25
|
<div id="secondary-toolbar" class="toolbar vertical-toolbar large-toolbar secondary-toolbar"></div>
|
|
25
26
|
</div>
|