Skip to content

Commit

Permalink
trigger test run
Browse files Browse the repository at this point in the history
Signed-off-by: Hannah Bollar <[email protected]>
  • Loading branch information
hanbollar committed Nov 13, 2023
1 parent 7979198 commit 42f4cf3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
test:
runs-on: ubuntu-latest
needs: build
# needs: build # todo
steps:
- uses: actions/checkout@v2

Expand Down
16 changes: 11 additions & 5 deletions dist/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -68861,10 +68861,10 @@ class Model extends _core_entity__WEBPACK_IMPORTED_MODULE_0__["default"] {
}

let extension = this.src.slice((this.src.lastIndexOf(".") - 1 >>> 0) + 2);
if (! (0,_utils_loadModel__WEBPACK_IMPORTED_MODULE_1__.loadModel)(this.src, extension, this.object3D)) {
if (! _utils_loadModel__WEBPACK_IMPORTED_MODULE_1__.loadModel.loadModel(this.src, extension, this.object3D)) {
console.log('ERR: in loading model ' + this.src);
return;
}
}

// TODO - recheck this lower part
this.dispatchEvent(new CustomEvent(`new-entity`, {bubbles: true}));
Expand All @@ -68885,6 +68885,7 @@ customElements.get('mr-model') || customElements.define('mr-model', Model);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "abc": () => (/* binding */ abc),
/* harmony export */ "loadModel": () => (/* binding */ loadModel)
/* harmony export */ });
/* harmony import */ var three_addons_loaders_GLTFLoader_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22);
Expand Down Expand Up @@ -68913,12 +68914,11 @@ __webpack_require__.r(__webpack_exports__);

// TODOs before merge
// - look into smaller todos leftover
// - check if loading managers are required or optional for all or just some objects
// - see if any items after loading should be returned instead of directly added to scene
// - prob should allow scene to be an optional parameter and return items as necessary
// - i should probably simply these to be more self contained of pure model and allow modifications on top, tbd
// - need to look at current stl loader setup and see if these match from an mr-js integration standpoint
// - current highest priority is GLB/GLTF and USDZ
// - if model already exists in the scene - add an instance of it instead of fully reloading

/*
// Loads 3dm file and adds it to the scene
Expand Down Expand Up @@ -69282,11 +69282,17 @@ function loadModel(filePath, extension, entityScene) {
} else if (extension == 'usdz') {
return loadUSDZ(filePath, entityScene);
} else {
console.log('ERR: the extensions ' + extension + ' is not supported by MR.js');
console.error('ERR: the extensions ' + extension + ' is not supported by MR.js');
return false;
}
}

function abc(a, b) {
return a + b;
}

// module.exports = loadModel;


/***/ }),
/* 41 */
Expand Down

0 comments on commit 42f4cf3

Please sign in to comment.