ASRS-3D.git - Gitblit

parent: 5bd8972c | 补丁 | 提交 | ignore whitespace

luxiaotao1123

2021-12-22 6867941aa52ca278e71c19998635edac8d807ccf

2个文件已修改

3个文件已添加

2 文件已重命名

	static/js/app.js	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	static/js/object/StoreConvey.js	127 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	static/model/obj/123.mtl	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	static/model/obj/123.obj	179067 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	static/model/obj/滚筒.mtl	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	static/model/obj/滚筒.obj	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	views/index.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 static/js/app.js

@@ -5,6 +5,7 @@
import {OBJLoader} from './lib/OBJLoader.js';
import {StoreShelf} from './object/StoreShelf.js';
import {StoreCrn} from './object/StoreCrn.js';
import {StoreConvey} from './object/StoreConvey.js';
import { Sky } from './object/Sky.js';


@@ -47,7 +48,7 @@
            this.initPointLockControl(this);
            this.initFloor();
            this.initBuilding();
            this.initTransporter(this);
            this.initConvey(this);
        }
        this.animate = function () {
            requestAnimationFrame(this.animate.bind(this));
@@ -338,34 +339,8 @@
                }
            }
        }
        this.initTransporter = function (object) {
            // const manager = new THREE.LoadingManager();
            // new MTLLoader(manager)
            //     .setPath( '../static/model/obj/' )
            //     .load( '13213.mtl', function ( materials ) {
            //         materials.preload();
            //         new OBJLoader( manager )
            //             .setMaterials( materials )
            //             .setPath( '../static/model/obj/' )
            //             .load( '13213.obj', function ( obj ) {
            //                 obj.traverse (function (child) {
            //                     if (child instanceof THREE.Mesh) {
            //                         child.material = new THREE.MeshLambertMaterial({
            //                             color: 0xCD6839
            //                         });
            //                     }
            //                 });
            //
            //                 obj.scale.set(0.03, 0.03, 0.03);
            //                 obj.rotateY(- Math.PI / 2);
            //                 // obj.name = option.crnNo + "-body";
            //                 obj.position.x = 0;
            //                 obj.position.y = 0;
            //                 obj.position.z = 0;
            //                 object.addObject( obj );
            //             }, null, null );
            //     });

        this.initConvey = function (object) {
            var convey = new StoreConvey(this);
        }
        this.initStoreObjects = function (object) {
            if (this.firstTime === 1) {

 static/js/object/StoreConvey.js

New file
@@ -0,0 +1,127 @@
import {MTLLoader} from "../lib/MTLLoader.js";
import {OBJLoader} from "../lib/OBJLoader.js";
import {Color} from "../three.module.js";

const xOffset = -1658;
const yOffset = -553;
const zOffset = -1800;

const xOffset0 = -1407;
const yOffset0 = 0;
const zOffset0 = 490;

function StoreConvey(object) {

    const manager = new THREE.LoadingManager();

    let chain = null;
    new MTLLoader(manager)
        .setPath( '../static/model/obj/' )
        .load( 'é¾æ¡è¾éæº.mtl', function ( materials ) {
            materials.preload();
            new OBJLoader( manager )
                .setMaterials( materials )
                .setPath( '../static/model/obj/' )
                .load( 'é¾æ¡è¾éæº.obj', function ( obj ) {
                    chain = obj;
                    chain.scale.set(0.03, 0.03, 0.025);
                    chain.rotateY( -Math.PI / 2);
                    chain.traverse (function (child) {
                        if (child instanceof THREE.Mesh) {
                            child.material = new THREE.MeshLambertMaterial({
                                color: 0xF5F5F5
                            });
                        }
                    });

                    for (let i = 0; i<24; i++) {
                        let clone = chain.clone();
                        // roller.name = option.crnNo + "-body";
                        let offset = 0;
                        if (i % 2 === 0) {
                            offset = 90;
                        }
                        clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
                        console.log(clone.position.x)
                        clone.position.y = yOffset0;
                        clone.position.z = zOffset0 + 39;
                        object.addObject( clone );
                    }

                    for (let i = 0; i<24; i++) {
                        let clone = chain.clone();
                        // roller.name = option.crnNo + "-body";
                        let offset = 0;
                        if (i % 2 === 0) {
                            offset = 90;
                        }
                        clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
                        console.log(clone.position.x)
                        clone.position.y = yOffset0;
                        clone.position.z = zOffset0 + 39 + 82;
                        object.addObject( clone );
                    }

                    for (let i = 0; i<24; i++) {
                        var clone = chain.clone();
                        // roller.name = option.crnNo + "-body";
                        let offset = 0;
                        if (i % 2 === 0) {
                            offset = 90;
                        }
                        clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
                        console.log(clone.position.x)
                        clone.position.y = yOffset0 + 310;
                        clone.position.z = zOffset0 + 39;
                        object.addObject( clone );
                    }

                    for (let i = 0; i<24; i++) {
                        let clone = chain.clone();
                        // roller.name = option.crnNo + "-body";
                        let offset = 0;
                        if (i % 2 === 0) {
                            offset = 90;
                        }
                        clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
                        console.log(clone.position.x)
                        clone.position.y = yOffset0 + 310;
                        clone.position.z = zOffset0 + 39 + 82;
                        object.addObject( clone );
                    }

                }, null, null );
        });

    let roller = null;
    new MTLLoader(manager)
        .setPath( '../static/model/obj/' )
        .load( '123.mtl', function ( materials ) {
            materials.preload();
            new OBJLoader( manager )
                .setMaterials( materials )
                .setPath( '../static/model/obj/' )
                .load( '123.obj', function ( obj ) {
                    roller = obj;
                    roller.traverse (function (child) {
                        if (child instanceof THREE.Mesh) {
                            child.material = new THREE.MeshLambertMaterial({
                                color: 0xCD6839
                            });
                        }
                    });

                    roller.scale.set(1000, 1000, 1000);
                    roller.rotateY(- Math.PI / 2);
                    // roller.name = option.crnNo + "-body";
                    roller.position.x = xOffset;
                    roller.position.y = yOffset;
                    roller.position.z = zOffset;
                    // object.addObject( roller );

                }, null, null );
    });

}

export {StoreConvey}

 static/model/obj/123.mtl

New file
@@ -0,0 +1,38 @@
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
# åå»ºçæä»¶:22.12.2021 15:10:02

newmtl Material__28
    Ns 10.0000
    Ni 1.5000
    d 1.0000
    Tr 0.0000
    Tf 1.0000 1.0000 1.0000 
    illum 2
    Ka 0.4000 0.6863 0.7569
    Kd 0.4000 0.6863 0.7569
    Ks 0.0000 0.0000 0.0000
    Ke 0.0000 0.0000 0.0000

newmtl Material__29
    Ns 10.0000
    Ni 1.5000
    d 1.0000
    Tr 0.0000
    Tf 1.0000 1.0000 1.0000 
    illum 2
    Ka 0.5020 0.5020 0.5020
    Kd 0.5020 0.5020 0.5020
    Ks 0.0000 0.0000 0.0000
    Ke 0.0000 0.0000 0.0000

newmtl Material__26
    Ns 10.0000
    Ni 1.5000
    d 1.0000
    Tr 0.0000
    Tf 1.0000 1.0000 1.0000 
    illum 2
    Ka 0.7529 0.7529 0.7529
    Kd 0.7529 0.7529 0.7529
    Ks 0.0000 0.0000 0.0000
    Ke 0.0000 0.0000 0.0000

 static/model/obj/123.obj

New file
Diff too large

 static/model/obj/¹öÍ².mtl


 static/model/obj/¹öÍ².obj


 views/index.html

@@ -98,8 +98,8 @@
    var speedDom = document.getElementById("speed");
    var timer = setInterval(function () {
        if (percent < 100.00) {
            percent += 0.02;
            // percent += 1;
            // percent += 0.02;
            percent += 1;
            speedDom.innerText = percent.toFixed(2);
        } else {
            speedDom.innerText = '100.00';
@@ -112,13 +112,13 @@

    $(document).on('click','.btn-word', function () {
        fullScreen()
        $("#mask").fadeOut(3000, function () {
        $("#mask").fadeOut(1, function () {
            setTimeout(function () {
                $("#ship-type-ul").css("transform", "translateY(-40px)");
                $("#ship-info-btn .btn-word").text("ä½éªè°åº¦ä¸ç");
                $("#ship-info-btn").data("type", 2).addClass("show");
                $("#ship-info-btn #btn-lock").css("z-index", "10");
            }, 1000);
            }, 1);
        });
        $("#title-box, #logo").addClass("show");
        $("#ship-info-btn").removeClass("show");

			@@ -5,6 +5,7 @@
			import {OBJLoader} from './lib/OBJLoader.js';
			import {StoreShelf} from './object/StoreShelf.js';
			import {StoreCrn} from './object/StoreCrn.js';
			import {StoreConvey} from './object/StoreConvey.js';
			import { Sky } from './object/Sky.js';


			@@ -47,7 +48,7 @@
			this.initPointLockControl(this);
			this.initFloor();
			this.initBuilding();
			this.initTransporter(this);
			this.initConvey(this);
			}
			this.animate = function () {
			requestAnimationFrame(this.animate.bind(this));
			@@ -338,34 +339,8 @@
			}
			}
			}
			this.initTransporter = function (object) {
			// const manager = new THREE.LoadingManager();
			// new MTLLoader(manager)
			// .setPath( '../static/model/obj/' )
			// .load( '13213.mtl', function ( materials ) {
			// materials.preload();
			// new OBJLoader( manager )
			// .setMaterials( materials )
			// .setPath( '../static/model/obj/' )
			// .load( '13213.obj', function ( obj ) {
			// obj.traverse (function (child) {
			// if (child instanceof THREE.Mesh) {
			// child.material = new THREE.MeshLambertMaterial({
			// color: 0xCD6839
			// });
			// }
			// });
			//
			// obj.scale.set(0.03, 0.03, 0.03);
			// obj.rotateY(- Math.PI / 2);
			// // obj.name = option.crnNo + "-body";
			// obj.position.x = 0;
			// obj.position.y = 0;
			// obj.position.z = 0;
			// object.addObject( obj );
			// }, null, null );
			// });

			this.initConvey = function (object) {
			var convey = new StoreConvey(this);
			}
			this.initStoreObjects = function (object) {
			if (this.firstTime === 1) {

New file
			@@ -0,0 +1,127 @@
			import {MTLLoader} from "../lib/MTLLoader.js";
			import {OBJLoader} from "../lib/OBJLoader.js";
			import {Color} from "../three.module.js";

			const xOffset = -1658;
			const yOffset = -553;
			const zOffset = -1800;

			const xOffset0 = -1407;
			const yOffset0 = 0;
			const zOffset0 = 490;

			function StoreConvey(object) {

			const manager = new THREE.LoadingManager();

			let chain = null;
			new MTLLoader(manager)
			.setPath( '../static/model/obj/' )
			.load( 'é¾æ¡è¾éæº.mtl', function ( materials ) {
			materials.preload();
			new OBJLoader( manager )
			.setMaterials( materials )
			.setPath( '../static/model/obj/' )
			.load( 'é¾æ¡è¾éæº.obj', function ( obj ) {
			chain = obj;
			chain.scale.set(0.03, 0.03, 0.025);
			chain.rotateY( -Math.PI / 2);
			chain.traverse (function (child) {
			if (child instanceof THREE.Mesh) {
			child.material = new THREE.MeshLambertMaterial({
			color: 0xF5F5F5
			});
			}
			});

			for (let i = 0; i<24; i++) {
			let clone = chain.clone();
			// roller.name = option.crnNo + "-body";
			let offset = 0;
			if (i % 2 === 0) {
			offset = 90;
			}
			clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
			console.log(clone.position.x)
			clone.position.y = yOffset0;
			clone.position.z = zOffset0 + 39;
			object.addObject( clone );
			}

			for (let i = 0; i<24; i++) {
			let clone = chain.clone();
			// roller.name = option.crnNo + "-body";
			let offset = 0;
			if (i % 2 === 0) {
			offset = 90;
			}
			clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
			console.log(clone.position.x)
			clone.position.y = yOffset0;
			clone.position.z = zOffset0 + 39 + 82;
			object.addObject( clone );
			}

			for (let i = 0; i<24; i++) {
			var clone = chain.clone();
			// roller.name = option.crnNo + "-body";
			let offset = 0;
			if (i % 2 === 0) {
			offset = 90;
			}
			clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
			console.log(clone.position.x)
			clone.position.y = yOffset0 + 310;
			clone.position.z = zOffset0 + 39;
			object.addObject( clone );
			}

			for (let i = 0; i<24; i++) {
			let clone = chain.clone();
			// roller.name = option.crnNo + "-body";
			let offset = 0;
			if (i % 2 === 0) {
			offset = 90;
			}
			clone.position.x = xOffset0 + 56 + offset + Math.floor(i/2)*230;
			console.log(clone.position.x)
			clone.position.y = yOffset0 + 310;
			clone.position.z = zOffset0 + 39 + 82;
			object.addObject( clone );
			}

			}, null, null );
			});

			let roller = null;
			new MTLLoader(manager)
			.setPath( '../static/model/obj/' )
			.load( '123.mtl', function ( materials ) {
			materials.preload();
			new OBJLoader( manager )
			.setMaterials( materials )
			.setPath( '../static/model/obj/' )
			.load( '123.obj', function ( obj ) {
			roller = obj;
			roller.traverse (function (child) {
			if (child instanceof THREE.Mesh) {
			child.material = new THREE.MeshLambertMaterial({
			color: 0xCD6839
			});
			}
			});

			roller.scale.set(1000, 1000, 1000);
			roller.rotateY(- Math.PI / 2);
			// roller.name = option.crnNo + "-body";
			roller.position.x = xOffset;
			roller.position.y = yOffset;
			roller.position.z = zOffset;
			// object.addObject( roller );

			}, null, null );
			});

			}

			export {StoreConvey}

New file
			@@ -0,0 +1,38 @@
			# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
			# åå»ºçæä»¶:22.12.2021 15:10:02

			newmtl Material__28
			Ns 10.0000
			Ni 1.5000
			d 1.0000
			Tr 0.0000
			Tf 1.0000 1.0000 1.0000
			illum 2
			Ka 0.4000 0.6863 0.7569
			Kd 0.4000 0.6863 0.7569
			Ks 0.0000 0.0000 0.0000
			Ke 0.0000 0.0000 0.0000

			newmtl Material__29
			Ns 10.0000
			Ni 1.5000
			d 1.0000
			Tr 0.0000
			Tf 1.0000 1.0000 1.0000
			illum 2
			Ka 0.5020 0.5020 0.5020
			Kd 0.5020 0.5020 0.5020
			Ks 0.0000 0.0000 0.0000
			Ke 0.0000 0.0000 0.0000

			newmtl Material__26
			Ns 10.0000
			Ni 1.5000
			d 1.0000
			Tr 0.0000
			Tf 1.0000 1.0000 1.0000
			illum 2
			Ka 0.7529 0.7529 0.7529
			Kd 0.7529 0.7529 0.7529
			Ks 0.0000 0.0000 0.0000
			Ke 0.0000 0.0000 0.0000

			@@ -98,8 +98,8 @@
			var speedDom = document.getElementById("speed");
			var timer = setInterval(function () {
			if (percent < 100.00) {
			percent += 0.02;
			// percent += 1;
			// percent += 0.02;
			percent += 1;
			speedDom.innerText = percent.toFixed(2);
			} else {
			speedDom.innerText = '100.00';
			@@ -112,13 +112,13 @@

			$(document).on('click','.btn-word', function () {
			fullScreen()
			$("#mask").fadeOut(3000, function () {
			$("#mask").fadeOut(1, function () {
			setTimeout(function () {
			$("#ship-type-ul").css("transform", "translateY(-40px)");
			$("#ship-info-btn .btn-word").text("ä½éªè°åº¦ä¸ç");
			$("#ship-info-btn").data("type", 2).addClass("show");
			$("#ship-info-btn #btn-lock").css("z-index", "10");
			}, 1000);
			}, 1);
			});
			$("#title-box, #logo").addClass("show");
			$("#ship-info-btn").removeClass("show");