Skip to content

Commit

Permalink
Merge pull request #223 from LinkunGao/bc/update_three
Browse files Browse the repository at this point in the history
Bc/update three
  • Loading branch information
LinkunGao authored May 1, 2023
2 parents c475bc7 + 2209387 commit 7699e62
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 46 deletions.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'LinkunGao'

# The full version, including alpha/beta/rc tags
release = 'v1.14.8'
release = 'v1.14.9'


# -- General configuration ---------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions docs/source/release/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -1634,3 +1634,7 @@ sceneIn?.loadNrrd(url, loadBar1, false, funa, opts);

- add prerender function in copperRenderer.
- remove gltf exporter for nuxt

## Release v1.14.9

- update threejs latest version.
43 changes: 9 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "copper3d_visualisation",
"description": "A 3d visualisation package base on threejs provides multiple scenes and Nrrd image load funtion.",
"version": "1.14.8",
"version": "1.14.9",
"main": "dist/bundle.umd.js",
"moudle": "dist/bundle.esm.js",
"types": "dist/types/index.d.ts",
Expand Down Expand Up @@ -48,13 +48,12 @@
"@types/dat.gui": "^0.7.9",
"@types/three": "^0.140.0",
"copper3d_plugin_heart_k": "^1.0.14",
"copper3d_plugin_nrrd": "^1.3.2",
"dat.gui": "^0.7.9",
"dicom-parser": "^1.8.13",
"fflate": "^0.7.3",
"file-saver": "^2.0.5",
"glsl-blend-soft-light": "^1.0.5",
"glsl-film-grain": "^1.0.4",
"three": "^0.150.1"
"three": "^0.152.2"
}
}
11 changes: 5 additions & 6 deletions src/Loader/copperNrrdLoader.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as THREE from "three";
// import { NRRDLoader } from "three/examples/jsm/loaders/NRRDLoader";
import { NRRDLoader } from "three/examples/jsm/loaders/NRRDLoader";
// import * as NRRD from "copper3d_plugin_nrrd";
import { NRRDLoader } from "copper3d_plugin_nrrd";
// import { NRRDLoader } from "copper3d_plugin_nrrd";

import copperScene from "../Scene/copperScene";
import { VolumeRenderShader1 } from "three/examples/jsm/shaders/VolumeShader";
Expand All @@ -21,7 +21,7 @@ loader = new NRRDLoader();

let cube: THREE.Mesh;
let gui: GUI | undefined;
let oldGuiDom:HTMLDivElement;
let oldGuiDom: HTMLDivElement;

let CircleGeometry = new THREE.RingGeometry(5, 6, 30);
let CircleMaterial = new THREE.MeshBasicMaterial({
Expand Down Expand Up @@ -159,7 +159,7 @@ export function copperNrrdLoader(
} else {
callback && callback(volume, nrrdMeshes, nrrdSlices);
}
gui = undefined
gui = undefined;
},
function (xhr: ProgressEvent<EventTarget>) {
loadingContainer.style.display = "flex";
Expand Down Expand Up @@ -429,10 +429,9 @@ export function addBoxHelper(
}

function configGui(opts?: optsType) {

if (opts && opts.openGui) {
if (opts.container) {
if(oldGuiDom){
if (oldGuiDom) {
opts.container.removeChild(oldGuiDom);
}
gui = new GUI({
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import {

import "./css/style.css";

export const REVISION = "v1.14.8";
export const REVISION = "v1.14.9";

console.log(
"%cCopper3D Visualisation %cBeta:v1.14.8",
"%cCopper3D Visualisation %cBeta:v1.14.9",
"padding: 3px;color:white; background:#023047",
"padding: 3px;color:white; background:#f50a25"
);
Expand Down

0 comments on commit 7699e62

Please sign in to comment.