css test ui

pull/7/head
FishOrBear 7 years ago
parent 70d1cea5da
commit dd7980b1c5

3
.gitignore vendored

@ -58,4 +58,5 @@ typings/
.env
#custom
.vscode
.vscode
/dist

@ -1 +0,0 @@
module.exports = __webpack_public_path__ + "bb09e96aa13d1d314ae8ba5a9e42175b.jpg";

@ -1 +0,0 @@
module.exports = __webpack_public_path__ + "94bed574871efc2888038b57b23805d1.jpg";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

1452
dist/bundle.js vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
module.exports = __webpack_public_path__ + "875c202ad7ad9d6b2272d1b03fbc50fb.jpg";

65305
dist/dll.js vendored

File diff suppressed because one or more lines are too long

1
dist/dll.js.map vendored

File diff suppressed because one or more lines are too long

9
dist/index.html vendored

@ -1,9 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Webpack App</title>
</head>
<body>
<script type="text/javascript" src="dll.js"></script><script type="text/javascript" src="bundle.js"></script></body>
</html>

File diff suppressed because one or more lines are too long

@ -4,8 +4,9 @@
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"dev": "webpack-dev-server"
"dev": "webpack-dev-server",
"dts": "tcm src -o ./src/UI/css_dts",
"build": "webpack --config dll.config.js &&webpack"
},
"author": "",
"license": "ISC",
@ -14,6 +15,7 @@
"awesome-typescript-loader": "^3.1.3",
"bootstrap-loader": "^2.1.0",
"css-loader": "^0.28.1",
"extract-text-webpack-plugin": "^2.1.0",
"file-loader": "^0.11.1",
"html-loader": "^0.4.5",
"required-loader": "^1.2.11",
@ -21,14 +23,15 @@
"source-map-loader": "^0.2.1",
"typescript": "^2.3.2",
"typings": "^2.1.1",
"typings-for-css-modules-loader": "^1.5.0",
"url-loader": "^0.5.8",
"webpack": "^2.5.0",
"webpack-dev-server": "^2.4.5"
},
"dependencies": {
"@types/node": "^7.0.18",
"@types/dat-gui": "^0.6.2",
"@types/lodash": "^4.14.64",
"@types/node": "^7.0.18",
"@types/react": "^15.0.24",
"@types/react-dom": "^15.5.0",
"@types/stats.js": "^0.16.0",
@ -38,6 +41,7 @@
"react": "^15.5.4",
"react-dom": "^15.5.4",
"stats.js": "^0.17.0",
"three": "^0.85.2"
"three": "^0.85.2",
"typed-css-modules": "^0.2.0"
}
}

@ -189,7 +189,7 @@ export class Application2
new CameraControls(this.m_Viewer, this.m_Viewer.m_Render.domElement);
// var gWorld_controls = new OrbitControls(this.m_Viewer.m_Camera.m_CurCamera, this.m_Viewer.m_Render.domElement);
//绘制直线
//绘制直线
var line = new Line(new THREE.Vector3(0, 0, 0),
new THREE.Vector3(100, 100, 0)
);
@ -199,8 +199,32 @@ export class Application2
var box = new Solid3d(3, 3, 3);
this.m_Database.appendEntity(box);
var box = new Solid3d(1, 1, 1);
this.m_Database.appendEntity(box);
new DebugDatUi();
}
static Application: Application2;
}
window["tt"] = function ()
{
let app = Application2.Application;
let camMat = app.m_Viewer.m_Camera.m_CurCamera.matrix;
let v = new THREE.Vector3(0, 1, 0);
// v.applyMatrix4(camMat);
v.applyQuaternion(app.m_Viewer.m_Camera.m_CurCamera.quaternion);
return v;
}
window["ft"] = function ()
{
let app = Application2.Application;
app.m_Viewer.m_Direction.set(0, 1, 0);
app.m_Viewer.m_bIsChange = true
}

@ -47,7 +47,18 @@ export class Line extends Curve
}
}
}
setEndPoint(pt: THREE.Vector3)
{
if (this.m_ThreeObj instanceof THREE.Line)
{
if (this.m_ThreeObj.geometry instanceof THREE.Geometry)
{
this.m_ThreeObj.geometry.vertices[1].set(pt.x, pt.y, pt.z);
this.m_ThreeObj.geometry.verticesNeedUpdate = true;
}
}
}
}
export class Solid3d extends Entity

@ -3,6 +3,8 @@
import * as THREE from "three"
import { Viewer } from "./Viewer";
import { Application2 } from "../Application";
import { Line, Solid3d } from "../DatabaseServices/Entity";
//相机类.
//https://www.youtube.com/watch?v=k3adBAnDpos
export class Camera
@ -57,7 +59,7 @@ export class Camera
this.m_CurCamera.updateProjectionMatrix();
this.m_CurCamera.position.copy(this.m_ParentViewer.m_Target);
// this.m_CurCamera.position.sub(this.m_ParentViewer.m_Direction);
this.m_CurCamera.position.sub(this.m_ParentViewer.m_Direction);
this.m_CurCamera.lookAt(this.m_ParentViewer.m_Target);
}
@ -119,6 +121,7 @@ export class CameraControls
this.m_domElement.addEventListener("mousemove", this.onMouseMove, false)
this.m_domElement.addEventListener("mouseup", this.onMouseUp, false)
window.addEventListener("keydown", this.onKeyDown, false);
window.addEventListener("keyup", this.onKeyUp, false);
this.m_domElement.addEventListener('wheel', this.onMouseWheel, false);
}
@ -161,12 +164,34 @@ export class CameraControls
}
onMouseMove = (event: MouseEvent) =>
{
event.preventDefault();
this.m_EndChickPoint.set(event.clientX, event.clientY, 0);
{
let app = Application2.Application;
let ent = app.m_Database.m_EntityCollection[2] as Solid3d;
ent.m_ThreeObj.position.copy(this.m_EndChickPoint);
this.m_Viewer.ScreenToScenePt(ent.m_ThreeObj.position);
// let pt = this.m_EndChickPoint.clone();
// this.m_Viewer.ScreenToScenePt(pt);
// ent.m_ThreeObj.position.copy(pt);
this.m_Viewer.m_bIsChange = true;
}
let changeVec: THREE.Vector3 = new THREE.Vector3();
changeVec.subVectors(this.m_EndChickPoint, this.m_StartChickPoint);
this.m_StartChickPoint.copy(this.m_EndChickPoint);
if (this["Control"] && this.m_State == State.Rotate)
{
this.m_Viewer.Rotate(changeVec);
}
switch (this.m_State)
{
case State.Pan:
@ -176,7 +201,7 @@ export class CameraControls
}
case State.Rotate:
{
this.m_Viewer.Rotate(changeVec);
break;
}
case State.Scale:

@ -6,9 +6,12 @@ import * as THREE from "three";
import Stats = require('stats.js')
//
const maxXRo = Math.PI * 0.5;
const minXRo = -maxXRo;
export class Viewer
{
m_zRo: any = Math.PI * 1;
m_xRo: number = maxXRo;
m_ViewHeight: number = 205;
//目标
m_Target: THREE.Vector3 = new THREE.Vector3(0, 0, 0);
@ -41,6 +44,16 @@ export class Viewer
this.Render();
}
ScreenToScenePt(pt: THREE.Vector3)
{
pt.x -= this.m_HtmlElement.scrollWidth * 0.5;
pt.y -= this.m_HtmlElement.scrollHeight * 0.5;
pt.y *= -1;
pt.multiplyScalar(this.m_ViewHeight / this.m_HtmlElement.scrollHeight);
pt.applyMatrix4(this.m_Camera.m_CurCamera.matrix);
}
//设置渲染场景
setScene(scene: THREE.Scene)
{
@ -72,7 +85,7 @@ export class Viewer
//设置设备像素比。 这通常用于HiDPI设备以防止模糊输出画布。
this.m_Render.setPixelRatio(window.devicePixelRatio);
//这里暂时初始化成这个. 未来将分离出 Viewer
this.m_Render.setSize(window.innerWidth - 30, window.innerHeight - 30);
this.m_Render.setSize(this.m_HtmlElement.scrollWidth, this.m_HtmlElement.scrollHeight);
//设置它的背景色为黑色
this.m_Render.setClearColor(0x000000, 1);
@ -91,13 +104,13 @@ export class Viewer
this.m_bIsChange = false;
this.m_Render.render(this.m_Scene, this.m_Camera.m_CurCamera);
}
this.m_Stats.end();
}
Pan(v: THREE.Vector3)
{
v.x *= -1;
v.multiplyScalar(this.m_ViewHeight / this.m_HtmlElement.offsetHeight);
v.y *= -1;
v.multiplyScalar(-this.m_ViewHeight / this.m_HtmlElement.scrollHeight);
v.applyQuaternion(this.m_Camera.m_CurCamera.quaternion);
this.m_Target.add(v);
this.m_Camera.Update();
this.m_bIsChange = true;
@ -111,8 +124,18 @@ export class Viewer
//传入画布的变换
Rotate(v: THREE.Vector3)
{
this.m_Direction.set(1, 1, -1);
this.m_xRo += v.y * 0.003;
this.m_zRo -= v.x * 0.003;
this.m_xRo = this.m_xRo > maxXRo ? maxXRo : this.m_xRo < minXRo ? minXRo : this.m_xRo;
this.m_Direction.z = - Math.sin(this.m_xRo);
let d = Math.abs(Math.cos(this.m_xRo));
this.m_Direction.x = Math.sin(this.m_zRo) * d;
this.m_Direction.y = -Math.cos(this.m_zRo) * d;
this.m_Direction.normalize()
this.m_Camera.UpdateDirection();
this.m_Camera.Update();
this.m_bIsChange = true;
}
}

@ -1,742 +0,0 @@
/**
* @author mrdoob / http://mrdoob.com/
*/
THREE.OBJLoader = function ( manager ) {
this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
this.materials = null;
this.regexp = {
// v float float float
vertex_pattern : /^v\s+([\d|\.|\+|\-|e|E]+)\s+([\d|\.|\+|\-|e|E]+)\s+([\d|\.|\+|\-|e|E]+)/,
// vn float float float
normal_pattern : /^vn\s+([\d|\.|\+|\-|e|E]+)\s+([\d|\.|\+|\-|e|E]+)\s+([\d|\.|\+|\-|e|E]+)/,
// vt float float
uv_pattern : /^vt\s+([\d|\.|\+|\-|e|E]+)\s+([\d|\.|\+|\-|e|E]+)/,
// f vertex vertex vertex
face_vertex : /^f\s+(-?\d+)\s+(-?\d+)\s+(-?\d+)(?:\s+(-?\d+))?/,
// f vertex/uv vertex/uv vertex/uv
face_vertex_uv : /^f\s+(-?\d+)\/(-?\d+)\s+(-?\d+)\/(-?\d+)\s+(-?\d+)\/(-?\d+)(?:\s+(-?\d+)\/(-?\d+))?/,
// f vertex/uv/normal vertex/uv/normal vertex/uv/normal
face_vertex_uv_normal : /^f\s+(-?\d+)\/(-?\d+)\/(-?\d+)\s+(-?\d+)\/(-?\d+)\/(-?\d+)\s+(-?\d+)\/(-?\d+)\/(-?\d+)(?:\s+(-?\d+)\/(-?\d+)\/(-?\d+))?/,
// f vertex//normal vertex//normal vertex//normal
face_vertex_normal : /^f\s+(-?\d+)\/\/(-?\d+)\s+(-?\d+)\/\/(-?\d+)\s+(-?\d+)\/\/(-?\d+)(?:\s+(-?\d+)\/\/(-?\d+))?/,
// o object_name | g group_name
object_pattern : /^[og]\s*(.+)?/,
// s boolean
smoothing_pattern : /^s\s+(\d+|on|off)/,
// mtllib file_reference
material_library_pattern : /^mtllib /,
// usemtl material_name
material_use_pattern : /^usemtl /
};
};
THREE.OBJLoader.prototype = {
constructor: THREE.OBJLoader,
load: function ( url, onLoad, onProgress, onError ) {
var scope = this;
var loader = new THREE.FileLoader( scope.manager );
loader.setPath( this.path );
loader.load( url, function ( text ) {
onLoad( scope.parse( text ) );
}, onProgress, onError );
},
setPath: function ( value ) {
this.path = value;
},
setMaterials: function ( materials ) {
this.materials = materials;
},
_createParserState : function () {
var state = {
objects : [],
object : {},
vertices : [],
normals : [],
uvs : [],
materialLibraries : [],
startObject: function ( name, fromDeclaration ) {
// If the current object (initial from reset) is not from a g/o declaration in the parsed
// file. We need to use it for the first parsed g/o to keep things in sync.
if ( this.object && this.object.fromDeclaration === false ) {
this.object.name = name;
this.object.fromDeclaration = ( fromDeclaration !== false );
return;
}
var previousMaterial = ( this.object && typeof this.object.currentMaterial === 'function' ? this.object.currentMaterial() : undefined );
if ( this.object && typeof this.object._finalize === 'function' ) {
this.object._finalize( true );
}
this.object = {
name : name || '',
fromDeclaration : ( fromDeclaration !== false ),
geometry : {
vertices : [],
normals : [],
uvs : []
},
materials : [],
smooth : true,
startMaterial : function( name, libraries ) {
var previous = this._finalize( false );
// New usemtl declaration overwrites an inherited material, except if faces were declared
// after the material, then it must be preserved for proper MultiMaterial continuation.
if ( previous && ( previous.inherited || previous.groupCount <= 0 ) ) {
this.materials.splice( previous.index, 1 );
}
var material = {
index : this.materials.length,
name : name || '',
mtllib : ( Array.isArray( libraries ) && libraries.length > 0 ? libraries[ libraries.length - 1 ] : '' ),
smooth : ( previous !== undefined ? previous.smooth : this.smooth ),
groupStart : ( previous !== undefined ? previous.groupEnd : 0 ),
groupEnd : -1,
groupCount : -1,
inherited : false,
clone : function( index ) {
var cloned = {
index : ( typeof index === 'number' ? index : this.index ),
name : this.name,
mtllib : this.mtllib,
smooth : this.smooth,
groupStart : 0,
groupEnd : -1,
groupCount : -1,
inherited : false
};
cloned.clone = this.clone.bind(cloned);
return cloned;
}
};
this.materials.push( material );
return material;
},
currentMaterial : function() {
if ( this.materials.length > 0 ) {
return this.materials[ this.materials.length - 1 ];
}
return undefined;
},
_finalize : function( end ) {
var lastMultiMaterial = this.currentMaterial();
if ( lastMultiMaterial && lastMultiMaterial.groupEnd === -1 ) {
lastMultiMaterial.groupEnd = this.geometry.vertices.length / 3;
lastMultiMaterial.groupCount = lastMultiMaterial.groupEnd - lastMultiMaterial.groupStart;
lastMultiMaterial.inherited = false;
}
// Ignore objects tail materials if no face declarations followed them before a new o/g started.
if ( end && this.materials.length > 1 ) {
for ( var mi = this.materials.length - 1; mi >= 0; mi-- ) {
if ( this.materials[mi].groupCount <= 0 ) {
this.materials.splice( mi, 1 );
}
}
}
// Guarantee at least one empty material, this makes the creation later more straight forward.
if ( end && this.materials.length === 0 ) {
this.materials.push({
name : '',
smooth : this.smooth
});
}
return lastMultiMaterial;
}
};
// Inherit previous objects material.
// Spec tells us that a declared material must be set to all objects until a new material is declared.
// If a usemtl declaration is encountered while this new object is being parsed, it will
// overwrite the inherited material. Exception being that there was already face declarations
// to the inherited material, then it will be preserved for proper MultiMaterial continuation.
if ( previousMaterial && previousMaterial.name && typeof previousMaterial.clone === "function" ) {
var declared = previousMaterial.clone( 0 );
declared.inherited = true;
this.object.materials.push( declared );
}
this.objects.push( this.object );
},
finalize : function() {
if ( this.object && typeof this.object._finalize === 'function' ) {
this.object._finalize( true );
}
},
parseVertexIndex: function ( value, len ) {
var index = parseInt( value, 10 );
return ( index >= 0 ? index - 1 : index + len / 3 ) * 3;
},
parseNormalIndex: function ( value, len ) {
var index = parseInt( value, 10 );
return ( index >= 0 ? index - 1 : index + len / 3 ) * 3;
},
parseUVIndex: function ( value, len ) {
var index = parseInt( value, 10 );
return ( index >= 0 ? index - 1 : index + len / 2 ) * 2;
},
addVertex: function ( a, b, c ) {
var src = this.vertices;
var dst = this.object.geometry.vertices;
dst.push( src[ a + 0 ] );
dst.push( src[ a + 1 ] );
dst.push( src[ a + 2 ] );
dst.push( src[ b + 0 ] );
dst.push( src[ b + 1 ] );
dst.push( src[ b + 2 ] );
dst.push( src[ c + 0 ] );
dst.push( src[ c + 1 ] );
dst.push( src[ c + 2 ] );
},
addVertexLine: function ( a ) {
var src = this.vertices;
var dst = this.object.geometry.vertices;
dst.push( src[ a + 0 ] );
dst.push( src[ a + 1 ] );
dst.push( src[ a + 2 ] );
},
addNormal : function ( a, b, c ) {
var src = this.normals;
var dst = this.object.geometry.normals;
dst.push( src[ a + 0 ] );
dst.push( src[ a + 1 ] );
dst.push( src[ a + 2 ] );
dst.push( src[ b + 0 ] );
dst.push( src[ b + 1 ] );
dst.push( src[ b + 2 ] );
dst.push( src[ c + 0 ] );
dst.push( src[ c + 1 ] );
dst.push( src[ c + 2 ] );
},
addUV: function ( a, b, c ) {
var src = this.uvs;
var dst = this.object.geometry.uvs;
dst.push( src[ a + 0 ] );
dst.push( src[ a + 1 ] );
dst.push( src[ b + 0 ] );
dst.push( src[ b + 1 ] );
dst.push( src[ c + 0 ] );
dst.push( src[ c + 1 ] );
},
addUVLine: function ( a ) {
var src = this.uvs;
var dst = this.object.geometry.uvs;
dst.push( src[ a + 0 ] );
dst.push( src[ a + 1 ] );
},
addFace: function ( a, b, c, d, ua, ub, uc, ud, na, nb, nc, nd ) {
var vLen = this.vertices.length;
var ia = this.parseVertexIndex( a, vLen );
var ib = this.parseVertexIndex( b, vLen );
var ic = this.parseVertexIndex( c, vLen );
var id;
if ( d === undefined ) {
this.addVertex( ia, ib, ic );
} else {
id = this.parseVertexIndex( d, vLen );
this.addVertex( ia, ib, id );
this.addVertex( ib, ic, id );
}
if ( ua !== undefined ) {
var uvLen = this.uvs.length;
ia = this.parseUVIndex( ua, uvLen );
ib = this.parseUVIndex( ub, uvLen );
ic = this.parseUVIndex( uc, uvLen );
if ( d === undefined ) {
this.addUV( ia, ib, ic );
} else {
id = this.parseUVIndex( ud, uvLen );
this.addUV( ia, ib, id );
this.addUV( ib, ic, id );
}
}
if ( na !== undefined ) {
// Normals are many times the same. If so, skip function call and parseInt.
var nLen = this.normals.length;
ia = this.parseNormalIndex( na, nLen );
ib = na === nb ? ia : this.parseNormalIndex( nb, nLen );
ic = na === nc ? ia : this.parseNormalIndex( nc, nLen );
if ( d === undefined ) {
this.addNormal( ia, ib, ic );
} else {
id = this.parseNormalIndex( nd, nLen );
this.addNormal( ia, ib, id );
this.addNormal( ib, ic, id );
}
}
},
addLineGeometry: function ( vertices, uvs ) {
this.object.geometry.type = 'Line';
var vLen = this.vertices.length;
var uvLen = this.uvs.length;
for ( var vi = 0, l = vertices.length; vi < l; vi ++ ) {
this.addVertexLine( this.parseVertexIndex( vertices[ vi ], vLen ) );
}
for ( var uvi = 0, l = uvs.length; uvi < l; uvi ++ ) {
this.addUVLine( this.parseUVIndex( uvs[ uvi ], uvLen ) );
}
}
};
state.startObject( '', false );
return state;
},
parse: function ( text ) {
console.time( 'OBJLoader' );
var state = this._createParserState();
if ( text.indexOf( '\r\n' ) !== - 1 ) {
// This is faster than String.split with regex that splits on both
text = text.replace( /\r\n/g, '\n' );
}
if ( text.indexOf( '\\\n' ) !== - 1) {
// join lines separated by a line continuation character (\)
text = text.replace( /\\\n/g, '' );
}
var lines = text.split( '\n' );
var line = '', lineFirstChar = '', lineSecondChar = '';
var lineLength = 0;
var result = [];
// Faster to just trim left side of the line. Use if available.
var trimLeft = ( typeof ''.trimLeft === 'function' );
for ( var i = 0, l = lines.length; i < l; i ++ ) {
line = lines[ i ];
line = trimLeft ? line.trimLeft() : line.trim();
lineLength = line.length;
if ( lineLength === 0 ) continue;
lineFirstChar = line.charAt( 0 );
// @todo invoke passed in handler if any
if ( lineFirstChar === '#' ) continue;
if ( lineFirstChar === 'v' ) {
lineSecondChar = line.charAt( 1 );
if ( lineSecondChar === ' ' && ( result = this.regexp.vertex_pattern.exec( line ) ) !== null ) {
// 0 1 2 3
// ["v 1.0 2.0 3.0", "1.0", "2.0", "3.0"]
state.vertices.push(
parseFloat( result[ 1 ] ),
parseFloat( result[ 2 ] ),
parseFloat( result[ 3 ] )
);
} else if ( lineSecondChar === 'n' && ( result = this.regexp.normal_pattern.exec( line ) ) !== null ) {
// 0 1 2 3
// ["vn 1.0 2.0 3.0", "1.0", "2.0", "3.0"]
state.normals.push(
parseFloat( result[ 1 ] ),
parseFloat( result[ 2 ] ),
parseFloat( result[ 3 ] )
);
} else if ( lineSecondChar === 't' && ( result = this.regexp.uv_pattern.exec( line ) ) !== null ) {
// 0 1 2
// ["vt 0.1 0.2", "0.1", "0.2"]
state.uvs.push(
parseFloat( result[ 1 ] ),
parseFloat( result[ 2 ] )
);
} else {
throw new Error( "Unexpected vertex/normal/uv line: '" + line + "'" );
}
} else if ( lineFirstChar === "f" ) {
if ( ( result = this.regexp.face_vertex_uv_normal.exec( line ) ) !== null ) {
// f vertex/uv/normal vertex/uv/normal vertex/uv/normal
// 0 1 2 3 4 5 6 7 8 9 10 11 12
// ["f 1/1/1 2/2/2 3/3/3", "1", "1", "1", "2", "2", "2", "3", "3", "3", undefined, undefined, undefined]
state.addFace(
result[ 1 ], result[ 4 ], result[ 7 ], result[ 10 ],
result[ 2 ], result[ 5 ], result[ 8 ], result[ 11 ],
result[ 3 ], result[ 6 ], result[ 9 ], result[ 12 ]
);
} else if ( ( result = this.regexp.face_vertex_uv.exec( line ) ) !== null ) {
// f vertex/uv vertex/uv vertex/uv
// 0 1 2 3 4 5 6 7 8
// ["f 1/1 2/2 3/3", "1", "1", "2", "2", "3", "3", undefined, undefined]
state.addFace(
result[ 1 ], result[ 3 ], result[ 5 ], result[ 7 ],
result[ 2 ], result[ 4 ], result[ 6 ], result[ 8 ]
);
} else if ( ( result = this.regexp.face_vertex_normal.exec( line ) ) !== null ) {
// f vertex//normal vertex//normal vertex//normal
// 0 1 2 3 4 5 6 7 8
// ["f 1//1 2//2 3//3", "1", "1", "2", "2", "3", "3", undefined, undefined]
state.addFace(
result[ 1 ], result[ 3 ], result[ 5 ], result[ 7 ],
undefined, undefined, undefined, undefined,
result[ 2 ], result[ 4 ], result[ 6 ], result[ 8 ]
);
} else if ( ( result = this.regexp.face_vertex.exec( line ) ) !== null ) {
// f vertex vertex vertex
// 0 1 2 3 4
// ["f 1 2 3", "1", "2", "3", undefined]
state.addFace(
result[ 1 ], result[ 2 ], result[ 3 ], result[ 4 ]
);
} else {
throw new Error( "Unexpected face line: '" + line + "'" );
}
} else if ( lineFirstChar === "l" ) {
var lineParts = line.substring( 1 ).trim().split( " " );
var lineVertices = [], lineUVs = [];
if ( line.indexOf( "/" ) === - 1 ) {
lineVertices = lineParts;
} else {
for ( var li = 0, llen = lineParts.length; li < llen; li ++ ) {
var parts = lineParts[ li ].split( "/" );
if ( parts[ 0 ] !== "" ) lineVertices.push( parts[ 0 ] );
if ( parts[ 1 ] !== "" ) lineUVs.push( parts[ 1 ] );
}
}
state.addLineGeometry( lineVertices, lineUVs );
} else if ( ( result = this.regexp.object_pattern.exec( line ) ) !== null ) {
// o object_name
// or
// g group_name
// WORKAROUND: https://bugs.chromium.org/p/v8/issues/detail?id=2869
// var name = result[ 0 ].substr( 1 ).trim();
var name = ( " " + result[ 0 ].substr( 1 ).trim() ).substr( 1 );
state.startObject( name );
} else if ( this.regexp.material_use_pattern.test( line ) ) {
// material
state.object.startMaterial( line.substring( 7 ).trim(), state.materialLibraries );
} else if ( this.regexp.material_library_pattern.test( line ) ) {
// mtl file
state.materialLibraries.push( line.substring( 7 ).trim() );
} else if ( ( result = this.regexp.smoothing_pattern.exec( line ) ) !== null ) {
// smooth shading
// @todo Handle files that have varying smooth values for a set of faces inside one geometry,
// but does not define a usemtl for each face set.
// This should be detected and a dummy material created (later MultiMaterial and geometry groups).
// This requires some care to not create extra material on each smooth value for "normal" obj files.
// where explicit usemtl defines geometry groups.
// Example asset: examples/models/obj/cerberus/Cerberus.obj
var value = result[ 1 ].trim().toLowerCase();
state.object.smooth = ( value === '1' || value === 'on' );
var material = state.object.currentMaterial();
if ( material ) {
material.smooth = state.object.smooth;
}
} else {
// Handle null terminated files without exception
if ( line === '\0' ) continue;
throw new Error( "Unexpected line: '" + line + "'" );
}
}
state.finalize();
var container = new THREE.Group();
container.materialLibraries = [].concat( state.materialLibraries );
for ( var i = 0, l = state.objects.length; i < l; i ++ ) {
var object = state.objects[ i ];
var geometry = object.geometry;
var materials = object.materials;
var isLine = ( geometry.type === 'Line' );
// Skip o/g line declarations that did not follow with any faces
if ( geometry.vertices.length === 0 ) continue;
var buffergeometry = new THREE.BufferGeometry();
buffergeometry.addAttribute( 'position', new THREE.BufferAttribute( new Float32Array( geometry.vertices ), 3 ) );
if ( geometry.normals.length > 0 ) {
buffergeometry.addAttribute( 'normal', new THREE.BufferAttribute( new Float32Array( geometry.normals ), 3 ) );
} else {
buffergeometry.computeVertexNormals();
}
if ( geometry.uvs.length > 0 ) {
buffergeometry.addAttribute( 'uv', new THREE.BufferAttribute( new Float32Array( geometry.uvs ), 2 ) );
}
// Create materials
var createdMaterials = [];
for ( var mi = 0, miLen = materials.length; mi < miLen ; mi++ ) {
var sourceMaterial = materials[mi];
var material = undefined;
if ( this.materials !== null ) {
material = this.materials.create( sourceMaterial.name );
// mtl etc. loaders probably can't create line materials correctly, copy properties to a line material.
if ( isLine && material && ! ( material instanceof THREE.LineBasicMaterial ) ) {
var materialLine = new THREE.LineBasicMaterial();
materialLine.copy( material );
material = materialLine;
}
}
if ( ! material ) {
material = ( ! isLine ? new THREE.MeshPhongMaterial() : new THREE.LineBasicMaterial() );
material.name = sourceMaterial.name;
}
material.shading = sourceMaterial.smooth ? THREE.SmoothShading : THREE.FlatShading;
createdMaterials.push(material);
}
// Create mesh
var mesh;
if ( createdMaterials.length > 1 ) {
for ( var mi = 0, miLen = materials.length; mi < miLen ; mi++ ) {
var sourceMaterial = materials[mi];
buffergeometry.addGroup( sourceMaterial.groupStart, sourceMaterial.groupCount, mi );
}
mesh = ( ! isLine ? new THREE.Mesh( buffergeometry, createdMaterials ) : new THREE.LineSegments( buffergeometry, createdMaterials ) );
} else {
mesh = ( ! isLine ? new THREE.Mesh( buffergeometry, createdMaterials[ 0 ] ) : new THREE.LineSegments( buffergeometry, createdMaterials[ 0 ] ) );
}
mesh.name = object.name;
container.add( mesh );
}
console.timeEnd( 'OBJLoader' );
return container;
}
};

@ -1,3 +1,68 @@
import * as React from "react";
export interface HelloProps { compiler: string; framework: string; }
export const Hello = (props: HelloProps) => <h1>Hello from {props.compiler} and {props.framework}!</h1>;
export interface Props
{
name: string;
enthusiasmLevel?: number;
}
function getExclamationMarks(numChars: number)
{
return Array(numChars + 1).join('!');
}
export class Hello extends React.Component<Props, object> {
render()
{
const { name, enthusiasmLevel = 1 } = this.props;
if (enthusiasmLevel <= 0)
{
throw new Error('You could be a little more enthusiastic. :D');
}
const css = `
.hello{
font-size: 150px;
}
`
return (
<div className="hello">
<style>
{css}
</style>
<div className="greeting">
Hello {name + getExclamationMarks(enthusiasmLevel)}
</div>
</div>
);
}
}
export class Sb extends React.Component<Props, object> {
render()
{
return (
<div className="Sb">
<div className="greeting">
</div>
</div>
);
}
}
export class Sx extends React.Component<Props, object> {
render()
{
return (
<div className="Main">
<div className="test">
<Hello name="CCC" enthusiasmLevel={3} />
<Sb name="Tx" />
</div>
</div>
);
}
}

@ -2,18 +2,22 @@ import { Application, Application2 } from "./Application";
import * as React from "react";
import * as ReactDOM from "react-dom";
import { Hello, Sx } from "./UI/demo";
import { Hello } from "./UI/demo";
import "./UI/Sb.css"
ReactDOM.render(
<Hello compiler="TypeScript" framework="React" />,
document.body
);
window.onload = function () {
new Application2();
window.onload = function ()
{
var info = document.createElement('div');
info.id = "root";
document.body.appendChild(info);
ReactDOM.render(
<Sx name="mian" />,
document.getElementById('root') as HTMLElement
);
// new Application2();
};

@ -1,6 +1,7 @@
var path = require('path');
var HtmlWebPackPlugin = require("html-webpack-plugin");
var AddAssetHtmlPlugin = require("add-asset-html-webpack-plugin");
var ExtractTextPlugin = require('extract-text-webpack-plugin');
const webpack = require('webpack');
module.exports = {
entry: "./src/index.tsx",
@ -16,7 +17,7 @@ module.exports = {
"stats-js": path.resolve(__dirname, './node_modules/stats.js/src/stats.js')
},
// Add '.ts' and '.tsx' as resolvable extensions.
extensions: [".ts", ".tsx", ".js","json"]
extensions: [".ts", ".tsx", ".js", "json"]
},
module: {
@ -24,25 +25,14 @@ module.exports = {
// All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'.
{ test: /\.tsx?$/, loader: "awesome-typescript-loader" },
{ test: /\.[(png)|(jpg)|(obj)]$/, loader: "file-loader" },
// //gui.dat
// { test: /\.css$/, loader: 'style-loader!css-loader' },
// { test: /\.png$/, loader: 'url-loader?limit=100000' },
// {
// test: /\.scss$/,
// use: [{
// loader: "style-loader" // creates style nodes from JS strings
// }, {
// loader: "css-loader" // translates CSS into CommonJS
// }, {
// loader: "sass-loader" // compiles Sass to CSS
// }]
// },
// { test: /\.html$/, loader: 'html-loader' }
],
// preLoaders: [
// // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
// { test: /\.js$/, loader: "source-map-loader" }
// ]
{
test: /\.css$/,
//use: ['style-loader', 'css-loader']
use: ExtractTextPlugin.extract({
use: 'css-loader'
})
}
]
},
// externals: {
// "react": "React",
@ -62,5 +52,6 @@ module.exports = {
}),
new HtmlWebPackPlugin(),
new AddAssetHtmlPlugin({ filepath: path.resolve(__dirname, "./dist/dll.js") }),
new ExtractTextPlugin('styles.css'),
]
};
Loading…
Cancel
Save