排钻显示改成实体显示.
This commit is contained in:
		
							
								
								
									
										3
									
								
								dist/Viewer.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/Viewer.js
									
									
									
									
										vendored
									
									
								
							@@ -5,6 +5,7 @@ const CameraUpdate_1 = require("./CameraUpdate");
 | 
				
			|||||||
const GeUtils_1 = require("./GeUtils");
 | 
					const GeUtils_1 = require("./GeUtils");
 | 
				
			||||||
const PlaneExt_1 = require("./PlaneExt");
 | 
					const PlaneExt_1 = require("./PlaneExt");
 | 
				
			||||||
const _1 = require(".");
 | 
					const _1 = require(".");
 | 
				
			||||||
 | 
					const ColorPalette_1 = require("./ColorPalette");
 | 
				
			||||||
class Viewer {
 | 
					class Viewer {
 | 
				
			||||||
    //构造
 | 
					    //构造
 | 
				
			||||||
    constructor(canvasContainer) {
 | 
					    constructor(canvasContainer) {
 | 
				
			||||||
@@ -42,7 +43,7 @@ class Viewer {
 | 
				
			|||||||
            let mesh = _1.PointPick(this, e.offsetX, e.offsetY);
 | 
					            let mesh = _1.PointPick(this, e.offsetX, e.offsetY);
 | 
				
			||||||
            if (oldMesh)
 | 
					            if (oldMesh)
 | 
				
			||||||
                oldMesh.material = _1.boardMaterial;
 | 
					                oldMesh.material = _1.boardMaterial;
 | 
				
			||||||
            if (mesh) {
 | 
					            if (mesh && mesh.material !== ColorPalette_1.ColorMaterial.GetLineMaterial(1)) {
 | 
				
			||||||
                oldMesh = mesh;
 | 
					                oldMesh = mesh;
 | 
				
			||||||
                mesh.material = _1.selectMaterial;
 | 
					                mesh.material = _1.selectMaterial;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								dist/Viewer.js.map
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/Viewer.js.map
									
									
									
									
										vendored
									
									
								
							@@ -1 +1 @@
 | 
				
			|||||||
{"version":3,"file":"Viewer.js","sourceRoot":"","sources":["../src/Viewer.ts"],"names":[],"mappings":"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"}
 | 
					{"version":3,"file":"Viewer.js","sourceRoot":"","sources":["../src/Viewer.ts"],"names":[],"mappings":"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"}
 | 
				
			||||||
							
								
								
									
										2
									
								
								dist/createBoard.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/createBoard.d.ts
									
									
									
									
										vendored
									
									
								
							@@ -13,7 +13,7 @@ export declare function createPath(pts: Vector2[], buls: number[], shapeOut?: Sh
 | 
				
			|||||||
export declare function getVec(data: object): THREE.Vector3;
 | 
					export declare function getVec(data: object): THREE.Vector3;
 | 
				
			||||||
export declare function createBoard(boardData: object): {
 | 
					export declare function createBoard(boardData: object): {
 | 
				
			||||||
    mesh: THREE.Mesh;
 | 
					    mesh: THREE.Mesh;
 | 
				
			||||||
    edges: THREE.LineSegments[];
 | 
					    edges: (THREE.Mesh | THREE.LineSegments)[];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
export declare function createTemplateBoard(brDataList: any[]): {
 | 
					export declare function createTemplateBoard(brDataList: any[]): {
 | 
				
			||||||
    meshs: any[];
 | 
					    meshs: any[];
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										9
									
								
								dist/createBoard.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								dist/createBoard.js
									
									
									
									
										vendored
									
									
								
							@@ -2,6 +2,7 @@
 | 
				
			|||||||
Object.defineProperty(exports, "__esModule", { value: true });
 | 
					Object.defineProperty(exports, "__esModule", { value: true });
 | 
				
			||||||
const THREE = require("three");
 | 
					const THREE = require("three");
 | 
				
			||||||
const three_1 = require("three");
 | 
					const three_1 = require("three");
 | 
				
			||||||
 | 
					const ColorPalette_1 = require("./ColorPalette");
 | 
				
			||||||
const GeUtils_1 = require("./GeUtils");
 | 
					const GeUtils_1 = require("./GeUtils");
 | 
				
			||||||
const Material_1 = require("./Material");
 | 
					const Material_1 = require("./Material");
 | 
				
			||||||
const RotateUV_1 = require("./RotateUV");
 | 
					const RotateUV_1 = require("./RotateUV");
 | 
				
			||||||
@@ -123,14 +124,18 @@ function createBoard(boardData) {
 | 
				
			|||||||
        if (boardData["Drillings"]) {
 | 
					        if (boardData["Drillings"]) {
 | 
				
			||||||
            let dris = boardData["Drillings"];
 | 
					            let dris = boardData["Drillings"];
 | 
				
			||||||
            for (let dri of dris) {
 | 
					            for (let dri of dris) {
 | 
				
			||||||
                let geo = new three_1.CylinderGeometry(dri.r, dri.r, dri.h, 32);
 | 
					                let geo = new three_1.CylinderGeometry(dri.r, dri.r, dri.h, 8);
 | 
				
			||||||
                geo.rotateX(Math.PI * 0.5);
 | 
					                geo.rotateX(Math.PI * 0.5);
 | 
				
			||||||
                if (dri.f === 0) //0正
 | 
					                if (dri.f === 0) //0正
 | 
				
			||||||
                    geo.translate(dri.x, dri.y, -dri.h * 0.5);
 | 
					                    geo.translate(dri.x, dri.y, -dri.h * 0.5);
 | 
				
			||||||
                else //1反
 | 
					                else //1反
 | 
				
			||||||
                    geo.translate(dri.x, dri.y, dri.h * 0.5 - boardData["H"]);
 | 
					                    geo.translate(dri.x, dri.y, dri.h * 0.5 - boardData["H"]);
 | 
				
			||||||
                geo.applyMatrix(boardMat);
 | 
					                geo.applyMatrix(boardMat);
 | 
				
			||||||
                edges.push(createEdge(geo));
 | 
					                let mesh = new three_1.Mesh(geo, ColorPalette_1.ColorMaterial.GetLineMaterial(1));
 | 
				
			||||||
 | 
					                edges.push(mesh);
 | 
				
			||||||
 | 
					                // let edge = createEdge(geo);
 | 
				
			||||||
 | 
					                // edge.material = new LineBasicMaterial({ color: new Color(1, 0, 0) });
 | 
				
			||||||
 | 
					                // edges.push(edge);
 | 
				
			||||||
                // let subCsg = new ThreeBSP(geo);
 | 
					                // let subCsg = new ThreeBSP(geo);
 | 
				
			||||||
                // thisCsg = thisCsg.subtract(subCsg);
 | 
					                // thisCsg = thisCsg.subtract(subCsg);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								dist/createBoard.js.map
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/createBoard.js.map
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "cadview",
 | 
					  "name": "cadview",
 | 
				
			||||||
  "version": "1.1.2",
 | 
					  "version": "1.1.3",
 | 
				
			||||||
  "description": "",
 | 
					  "description": "",
 | 
				
			||||||
  "main": "dist/index.js",
 | 
					  "main": "dist/index.js",
 | 
				
			||||||
  "types": "dist/index.d.ts",
 | 
					  "types": "dist/index.d.ts",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +1,11 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import * as THREE from "three";
 | 
					import * as THREE from "three";
 | 
				
			||||||
 | 
					import { Mesh } from "three";
 | 
				
			||||||
 | 
					import { CameraControls, PointPick, boardMaterial, selectMaterial } from ".";
 | 
				
			||||||
import { CameraUpdate } from "./CameraUpdate";
 | 
					import { CameraUpdate } from "./CameraUpdate";
 | 
				
			||||||
 | 
					import { ColorMaterial } from "./ColorPalette";
 | 
				
			||||||
import { GetBox, GetBoxArr, cZeroVec } from "./GeUtils";
 | 
					import { GetBox, GetBoxArr, cZeroVec } from "./GeUtils";
 | 
				
			||||||
import { PlaneExt } from "./PlaneExt";
 | 
					import { PlaneExt } from "./PlaneExt";
 | 
				
			||||||
import { PointPick, boardMaterial, CameraControls, selectMaterial } from ".";
 | 
					 | 
				
			||||||
import { MeshBasicMaterial, Color, Mesh } from "three";
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
export class Viewer
 | 
					export class Viewer
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -38,7 +39,7 @@ export class Viewer
 | 
				
			|||||||
            let mesh = PointPick(this, e.offsetX, e.offsetY);
 | 
					            let mesh = PointPick(this, e.offsetX, e.offsetY);
 | 
				
			||||||
            if (oldMesh)
 | 
					            if (oldMesh)
 | 
				
			||||||
                oldMesh.material = boardMaterial;
 | 
					                oldMesh.material = boardMaterial;
 | 
				
			||||||
            if (mesh)
 | 
					            if (mesh && mesh.material !== ColorMaterial.GetLineMaterial(1))
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                oldMesh = mesh;
 | 
					                oldMesh = mesh;
 | 
				
			||||||
                mesh.material = selectMaterial;
 | 
					                mesh.material = selectMaterial;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,6 @@
 | 
				
			|||||||
import * as THREE from 'three';
 | 
					import * as THREE from 'three';
 | 
				
			||||||
import { Geometry, LineSegments, Shape, Vector2, CylinderGeometry } from 'three';
 | 
					import { CylinderGeometry, Geometry, LineSegments, Mesh, Shape, Vector2 } from 'three';
 | 
				
			||||||
 | 
					import { ColorMaterial } from './ColorPalette';
 | 
				
			||||||
import { polar } from './GeUtils';
 | 
					import { polar } from './GeUtils';
 | 
				
			||||||
import { boardMaterial, edgeMaterial } from './Material';
 | 
					import { boardMaterial, edgeMaterial } from './Material';
 | 
				
			||||||
import { RotateUVs } from './RotateUV';
 | 
					import { RotateUVs } from './RotateUV';
 | 
				
			||||||
@@ -137,8 +138,7 @@ export function createBoard(boardData: object)
 | 
				
			|||||||
    ext.applyMatrix(boardMat);
 | 
					    ext.applyMatrix(boardMat);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //外边.
 | 
					    //外边.
 | 
				
			||||||
    let edges = [createEdge(ext)];
 | 
					    let edges: (LineSegments | Mesh)[] = [createEdge(ext)];
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //差集
 | 
					    //差集
 | 
				
			||||||
    if (checkObjectArray(boardData, "SubBoardLocal")
 | 
					    if (checkObjectArray(boardData, "SubBoardLocal")
 | 
				
			||||||
@@ -161,7 +161,7 @@ export function createBoard(boardData: object)
 | 
				
			|||||||
            let dris = boardData["Drillings"];
 | 
					            let dris = boardData["Drillings"];
 | 
				
			||||||
            for (let dri of dris)
 | 
					            for (let dri of dris)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                let geo = new CylinderGeometry(dri.r, dri.r, dri.h, 32);
 | 
					                let geo = new CylinderGeometry(dri.r, dri.r, dri.h, 8);
 | 
				
			||||||
                geo.rotateX(Math.PI * 0.5);
 | 
					                geo.rotateX(Math.PI * 0.5);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if (dri.f === 0) //0正
 | 
					                if (dri.f === 0) //0正
 | 
				
			||||||
@@ -171,7 +171,11 @@ export function createBoard(boardData: object)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                geo.applyMatrix(boardMat);
 | 
					                geo.applyMatrix(boardMat);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                edges.push(createEdge(geo));
 | 
					                let mesh = new Mesh(geo, ColorMaterial.GetLineMaterial(1));
 | 
				
			||||||
 | 
					                edges.push(mesh);
 | 
				
			||||||
 | 
					                // let edge = createEdge(geo);
 | 
				
			||||||
 | 
					                // edge.material = new LineBasicMaterial({ color: new Color(1, 0, 0) });
 | 
				
			||||||
 | 
					                // edges.push(edge);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                // let subCsg = new ThreeBSP(geo);
 | 
					                // let subCsg = new ThreeBSP(geo);
 | 
				
			||||||
                // thisCsg = thisCsg.subtract(subCsg);
 | 
					                // thisCsg = thisCsg.subtract(subCsg);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user