Merge pull request #10 from shiplab/dev

Pull from Dev
shiplab · Mar 7, 2021 · ca39185 · ca39185
2 parents fd840fc + 94e3130
commit ca39185
Show file tree

Hide file tree

Showing 19 changed files with 390 additions and 16 deletions.
diff --git a/examples/3D_engine/Configurable_ocean_v2.js b/examples/3D_engine/Configurable_ocean_v2.js
@@ -150,7 +150,7 @@ function Ocean(params) {
 		this.water = new THREE.Water(waterGeometry, {
 			textureWidth: 512,
 			textureHeight: 512,
-			waterNormals: new THREE.TextureLoader().load("textures/waternormals.jpg", function (texture) {
+			waterNormals: new THREE.TextureLoader().load("3D_engine/textures/waternormals.jpg", function (texture) {
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 			}),
 			alpha: 1.0,

diff --git a/examples/3D_engine/Regular_ocean.js b/examples/3D_engine/Regular_ocean.js
@@ -88,7 +88,7 @@ function Ocean(params) {
 	The mirror effect does not account for geometry, and there is no self-mirroring. But it mostly looks OK anyway. On tall waves, one can see that the rendered texture is stretched.
 	*/
 	try {
-		let waterNormals = new THREE.TextureLoader().load('textures/waternormals.jpg');
+		let waterNormals = new THREE.TextureLoader().load('3D_engine/textures/waternormals.jpg');
 		waterNormals.wrapS = waterNormals.wrapT = THREE.RepeatWrapping;
 		this.water = new THREE.Water(renderer, camera, scene, {
 			textureWidth: 512,

diff --git a/examples/3D_engine/Ship3D_v2.js b/examples/3D_engine/Ship3D_v2.js
@@ -493,6 +493,7 @@ function Hull3D(hull, design_draft) {
 
 	this.hull = hull;
 	this.group = "Hull3D"
+	this.name = "Hull3D"
 	this.design_draft = design_draft !== undefined ? design_draft : 0.5 * hull.attributes.Depth;
 	this.upperColor = typeof hull.style.upperColor !== "undefined" ? hull.style.upperColor : 0x33aa33;
 	this.lowerColor = typeof hull.style.lowerColor !== "undefined" ? hull.style.lowerColor : 0xaa3333;

diff --git a/examples/3D_engine/legacy/Configurable_ocean.js b/examples/3D_engine/legacy/Configurable_ocean.js
@@ -143,7 +143,7 @@ function Ocean(params) {
 	The mirror effect does not account for geometry, and there is no self-mirroring. But it mostly looks OK anyway. On tall waves, one can see that the rendered texture is stretched.
 	*/
 	try {
-		let waterNormals = new THREE.TextureLoader().load("textures/waternormals.jpg");
+		let waterNormals = new THREE.TextureLoader().load("3D_engine/textures/waternormals.jpg");
 		waterNormals.wrapS = waterNormals.wrapT = THREE.RepeatWrapping;
 		this.water = new THREE.Water(renderer, camera, scene, {
 			textureWidth: 512,

diff --git a/examples/3D_engine/legacy/skybox_from_examples.js b/examples/3D_engine/legacy/skybox_from_examples.js
@@ -3,7 +3,7 @@ function Skybox(size) {
 	var cubeMap = new THREE.CubeTexture([]);
 	cubeMap.format = THREE.RGBFormat;
 	var loader = new THREE.ImageLoader();
-	loader.load("textures/skyboxsun25degtest1.png", function (image) {
+	loader.load("3D_engine/textures/skyboxsun25degtest1.png", function (image) {
 		var getSide = function (x, y) {
 			var size = 1024;
 			var canvas = document.createElement("canvas");

diff --git a/examples/3D_engine/skybox_from_examples_r118.js b/examples/3D_engine/skybox_from_examples_r118.js
@@ -3,7 +3,7 @@ function Skybox(size) {
 	var cubeMap = new THREE.CubeTexture([]);
 	cubeMap.format = THREE.RGBFormat;
 	var loader = new THREE.ImageLoader();
-	loader.load("textures/skyboxsun25degtest1.png", function (image) {
+	loader.load("3D_engine/textures/skyboxsun25degtest1.png", function (image) {
 		var getSide = function (x, y) {
 			var size = 1024;
 			var canvas = document.createElement("canvas");

diff --git a/examples/textures/bottom.jpg → examples/3D_engine/textures/bottom.jpg b/examples/textures/bottom.jpg → examples/3D_engine/textures/bottom.jpg
diff --git a/examples/textures/skyboxsun25degtest1.png → ...D_engine/textures/skyboxsun25degtest1.png b/examples/textures/skyboxsun25degtest1.png → ...D_engine/textures/skyboxsun25degtest1.png
diff --git a/examples/textures/waternormals.jpg → examples/3D_engine/textures/waternormals.jpg b/examples/textures/waternormals.jpg → examples/3D_engine/textures/waternormals.jpg