Skip to content

Commit

Permalink
Fix: Point 3D viewer at newest Box3D runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
MiiBond authored Sep 5, 2017
1 parent 09aa1cd commit 3420799
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 36 deletions.
2 changes: 1 addition & 1 deletion build/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const webpackConfig = require('./webpack.karma.config');

const DOC_STATIC_ASSETS_VERSION = '1.7.0';
const MEDIA_STATIC_ASSETS_VERSION = '1.8.0';
const MODEL3D_STATIC_ASSETS_VERSION = '1.4.1';
const MODEL3D_STATIC_ASSETS_VERSION = '1.6.1';
const SWF_STATIC_ASSETS_VERSION = '0.112.0';
const TEXT_STATIC_ASSETS_VERSION = '0.114.0';

Expand Down
2 changes: 1 addition & 1 deletion src/lib/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const X_REP_HINT_VIDEO_MP4 = '[mp4]';
// whenever a file in that third party directory is updated
export const DOC_STATIC_ASSETS_VERSION = '1.7.0';
export const MEDIA_STATIC_ASSETS_VERSION = '1.8.0';
export const MODEL3D_STATIC_ASSETS_VERSION = '1.4.1';
export const MODEL3D_STATIC_ASSETS_VERSION = '1.6.1';
export const SWF_STATIC_ASSETS_VERSION = '0.112.0';
export const TEXT_STATIC_ASSETS_VERSION = '0.114.0';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,71 +121,78 @@
"lookSpeed": 0.5
},
"enabled": true,
"name": "unnamed component",
"name": "Orbit Camera",
"id": "2a1cf65c-072b-4fd9-8bbd-81d1635aeb8d"
},
{
"scriptId": "vr_render_view",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "VR Render View",
"id": "6d1ac5a8-3b04-47f6-9af2-e7084ce32fe1"
},
{
"scriptId": "vr_camera_controller",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "VR Camera Controller",
"id": "785929b7-8327-480d-89e7-856e48a36853"
},
{
"scriptId": "orbit_camera_focus",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Camera Focus",
"id": "6886abb5-a5b7-4703-bed8-77d656dccd3c"
},
{
"scriptId": "camera_zoom",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Camera Zoom",
"id": "35fccf51-09db-49f5-9d8f-de02596eb01f"
}
],
"previousComponents": [
{
"scriptId": "orbit_camera",
"attributes": {
"panEnabled": false,
"panEnabled": true,
"zoomEnabled": true,
"inertialDamping": 0.2,
"lookSpeed": 0.5
},
"enabled": true,
"name": "unnamed component",
"name": "Orbit Camer",
"id": "2a1cf65c-072b-4fd9-8bbd-81d1635aeb8d"
},
{
"scriptId": "vr_render_view",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "VR Render Vie",
"id": "6d1ac5a8-3b04-47f6-9af2-e7084ce32fe1"
},
{
"scriptId": "vr_camera_controller",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "VR Camera Controlle",
"id": "785929b7-8327-480d-89e7-856e48a36853"
},
{
"scriptId": "orbit_camera_focus",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Camera Focu",
"id": "6886abb5-a5b7-4703-bed8-77d656dccd3c"
},
{
"scriptId": "camera_zoom",
"attributes": {},
"enabled": true,
"name": "Camera Zoo",
"id": "35fccf51-09db-49f5-9d8f-de02596eb01f"
}
],
"parentId": "63eb5333-ac0b-4f6d-b181-044627418545",
Expand All @@ -205,7 +212,7 @@
},
"position": {
"x": 0,
"y": 1.7976931348623157e+308,
"y": 0,
"z": 0
},
"quaternion": {
Expand Down Expand Up @@ -235,7 +242,7 @@
},
"position": {
"x": 0,
"y": 1.7976931348623157e+308,
"y": 0,
"z": 0
}
},
Expand All @@ -244,14 +251,14 @@
"scriptId": "remote_instance",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Load Box 3D File",
"id": "4ec9f926-f404-4f16-a845-33b959946d26"
},
{
"scriptId": "scale_to_size",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Scale to Size",
"id": "f4a752e9-e7e7-49df-9f5e-b478751b3da7"
},
{
Expand All @@ -264,7 +271,7 @@
}
},
"enabled": true,
"name": "unnamed component",
"name": "Alignment",
"id": "a4818007-4c88-4756-adfa-b13fcbe96054"
}
],
Expand All @@ -273,15 +280,28 @@
"scriptId": "remote_instance",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "LoadBox 3D File",
"id": "4ec9f926-f404-4f16-a845-33b959946d26"
},
{
"scriptId": "scale_to_size",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Scale to Siz",
"id": "f4a752e9-e7e7-49df-9f5e-b478751b3da7"
},
{
"scriptId": "align_to_position",
"attributes": {
"alignment": {
"x": 0,
"y": -1,
"z": 0
}
},
"enabled": true,
"name": "Alignmen",
"id": "a4818007-4c88-4756-adfa-b13fcbe96054"
}
],
"parentId": "63eb5333-ac0b-4f6d-b181-044627418545",
Expand All @@ -296,9 +316,9 @@
"name": "Ambient Light",
"lightType": "ambient",
"position": {
"x": -1,
"y": 1,
"z": 1
"x": 0,
"y": 0,
"z": 0
},
"intensity": 1,
"color": {
Expand All @@ -307,13 +327,7 @@
"b": 0.996078431372549
}
},
"previousProperties": {
"color": {
"r": 0.996078431372549,
"g": 0.996078431372549,
"b": 0.996078431372549
}
},
"previousProperties": {},
"components": [],
"previousComponents": [],
"parentId": "63eb5333-ac0b-4f6d-b181-044627418545",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,28 @@
}
},
"enabled": true,
"name": "unnamed component",
"name": "Default Renderer",
"id": "76add60f-9843-41e9-964d-cd56e0049a8a"
},
{
"scriptId": "input",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Input",
"id": "be9272c0-0399-42f7-872a-02ee89220ea8"
},
{
"scriptId": "render_modes",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Render Modes",
"id": "8f323e1e-698c-4f66-bf5b-1815698ac4ac"
},
{
"scriptId": "vr_presenter",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "VR Presenter",
"id": "78893c41-5e2f-452d-a94e-41094d9f32b3"
}
],
Expand All @@ -62,22 +62,29 @@
}
},
"enabled": true,
"name": "unnamed component",
"name": "DefaultRenderer",
"id": "76add60f-9843-41e9-964d-cd56e0049a8a"
},
{
"scriptId": "input",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Inpu",
"id": "be9272c0-0399-42f7-872a-02ee89220ea8"
},
{
"scriptId": "render_modes",
"attributes": {},
"enabled": true,
"name": "unnamed component",
"name": "Render Mode",
"id": "8f323e1e-698c-4f66-bf5b-1815698ac4ac"
},
{
"scriptId": "vr_presenter",
"attributes": {},
"enabled": true,
"name": "VR Presente",
"id": "78893c41-5e2f-452d-a94e-41094d9f32b3"
}
],
"representations": []
Expand Down

0 comments on commit 3420799

Please sign in to comment.