From f87d5a56965dfe20cb981afc5b84d9a6757c5a89 Mon Sep 17 00:00:00 2001 From: FishOrBear Date: Thu, 11 May 2017 22:43:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Onsize=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/extens.ts => sample/redme.txt | 5 +++ src/app/expand/ExpandManage.ts | 57 ++++++++++--------------------- src/app/mesh/createBoard.ts | 56 ++++-------------------------- src/main.ts | 7 ++-- src/old/Texture.ts | 4 +-- 5 files changed, 37 insertions(+), 92 deletions(-) rename src/extens.ts => sample/redme.txt (84%) diff --git a/src/extens.ts b/sample/redme.txt similarity index 84% rename from src/extens.ts rename to sample/redme.txt index 8203ae6e4..09b36432a 100644 --- a/src/extens.ts +++ b/sample/redme.txt @@ -1,3 +1,8 @@ + + +这个文件写的是一些实例. + + //注册功能. 可以在unload里面添加 export function test() { diff --git a/src/app/expand/ExpandManage.ts b/src/app/expand/ExpandManage.ts index 3cb805492..6cbd0cff0 100644 --- a/src/app/expand/ExpandManage.ts +++ b/src/app/expand/ExpandManage.ts @@ -3,58 +3,37 @@ // import { App } from "../../main"; - - - -interface Call -{ - star(n: number): object; - end(n: number): object; -} - - -//消息管理 -class EvenManage +import { App } from "../../main"; +import * as THREE from 'three' +export class ExpandManage { - evenList: Call[]; - star(n: number) - { - // for -> star - } - end(n: number) + constructor() { - //for end + //Load code + console.log("logBegin."); + new ResizeEven(); } } -var evenM = new EvenManage(); -function add(n: number) -{ - -} - - - -//单例. -export class ExpandManage +export class ResizeEven { constructor() { - //不做任何事情. + window.addEventListener('resize', () => ResizeEven.onWindowResize, false); } - static load() - { - //TODO addLoad - console.log("ExpandLog") - exet(); - } - static unload() - { - //TODO unLoad + //事件. + static onWindowResize() + { + let app = App.getCurApp(); + if (app.gCurCamera && app.gCurCamera instanceof THREE.OrthographicCamera) { + // app.gCurCamera.aspect = window.innerWidth / window.innerHeight; + app.gCurCamera.updateProjectionMatrix(); + } + app.gRender.setSize(window.innerWidth, window.innerHeight); } } \ No newline at end of file diff --git a/src/app/mesh/createBoard.ts b/src/app/mesh/createBoard.ts index 843678bfd..b590921ce 100644 --- a/src/app/mesh/createBoard.ts +++ b/src/app/mesh/createBoard.ts @@ -31,6 +31,7 @@ namespace CreateBoardUtil this.m_StartAn = p1.clone().sub(this.m_Center).angle(); this.m_EndAn = p2.clone().sub(this.m_Center).angle(); if (bul < 0) { + //一个神奇的特性 它需要这么做 this.m_StartAn -= Math.PI; this.m_EndAn -= Math.PI; } @@ -65,7 +66,11 @@ namespace CreateBoardUtil export function getVec(data: object): THREE.Vector3 { return new THREE.Vector3(data["x"], data["y"], data["z"]); - } export function createBoard(boardData: object) + } + + + //创建板件 暂时这么写 + export function createBoard(boardData: object) { var pts: THREE.Vector2[] = new Array(); var buls: number[] = new Array(); @@ -105,54 +110,7 @@ namespace CreateBoardUtil ext.translate(0, 0, -18) ext.applyMatrix(boardMat); - var loader: THREE.TextureLoader = new THREE.TextureLoader(); - var url = require("file-loader?!../textures/木纹.jpg"); - var texture: THREE.Texture = loader.load(url); - - texture.wrapS = texture.wrapT = THREE.RepeatWrapping; // CHANGED - texture.offset.set(0, 1); // CHANGED - texture.repeat.set(0.002, 0.002); // CHANGED - texture.needsUpdate = true; - - - - //var mesh = new THREE.Mesh(ext, new THREE.MeshNormalMaterial());// map: texture THREE.MeshPhongMaterial({ side: THREE.DoubleSide }) - var nMater = new THREE.MeshNormalMaterial(); - var material = new THREE.MeshPhongMaterial({ map: texture }); // front - var material2 = new THREE.ShaderMaterial({ - uniforms: {} - }); - material2.extensions.derivatives = true; - - var mat5 = new THREE.MeshBasicMaterial({ - color: 0xFF00FF, - map: texture - }); - var mat3 = new THREE.MeshBasicMaterial({ wireframe: true }); - var mat4 = new THREE.MeshLambertMaterial({ map: texture }); - - - var mat6 = new THREE.MeshBasicMaterial({ - // color: 0xFF00FF, - map: texture - }); - - // add a wireframe to highlight the segmentation - // var mesh = THREE.SceneUtils.createMultiMaterialObject(ext, [mat6, new THREE.MeshPhongMaterial({ - // color: 0x000000, - // wireframe: true, - // // transparent: true - // })]); - mat4.needsUpdate = true; - - var mat7 = new THREE.MeshStandardMaterial({ - color: 0xffffff, - roughness: 0.5, - metalness: 1.0, - map: texture - }); - var mesh = new THREE.Mesh(ext, mat4); - mesh.castShadow = true; + var mesh = new THREE.Mesh(ext); return mesh; } diff --git a/src/main.ts b/src/main.ts index 8720ffaa0..8503a4970 100644 --- a/src/main.ts +++ b/src/main.ts @@ -21,8 +21,7 @@ export class App //渲染循环 this.render(); - //加载插件 - ExpandManage.load(); + new ExpandManage(); } gCameraMap: Map; @@ -57,6 +56,10 @@ export class App // maxLights: 1//maxLights:最大灯光数 } ); + + //这里暂时初始化成这个. 未来将分离出 Viewer + this.gRender.setSize(window.innerWidth, window.innerHeight); + //设置它的背景色为白色 this.gRender.setClearColor(0x000000, 0.5); //加到画布 diff --git a/src/old/Texture.ts b/src/old/Texture.ts index ef266a00d..c0d89348a 100644 --- a/src/old/Texture.ts +++ b/src/old/Texture.ts @@ -1,2 +1,2 @@ -var loader = new THREE.TextureLoader(); -var texture = loader.load("textures/UV_Grid_Sm.jpg"); +// var loader = new THREE.TextureLoader(); +// var texture = loader.load("textures/UV_Grid_Sm.jpg");