From 36868af73606c030e50f276a159a1b3740c8b4d4 Mon Sep 17 00:00:00 2001 From: Mario Rodrigues Date: Sun, 1 Mar 2020 07:12:36 +0000 Subject: [PATCH 1/3] Improved shooter design --- .../ShooterGeometry/ShooterGeometry.js | 68 ++++++++++++------- src/stores/initialState.js | 2 +- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/src/renderer/Core/GameComponents/ShooterGeometry/ShooterGeometry.js b/src/renderer/Core/GameComponents/ShooterGeometry/ShooterGeometry.js index d01bc22..c30b979 100644 --- a/src/renderer/Core/GameComponents/ShooterGeometry/ShooterGeometry.js +++ b/src/renderer/Core/GameComponents/ShooterGeometry/ShooterGeometry.js @@ -8,11 +8,14 @@ export class ShooterGeometry extends React.Component { pointer; leftEnergy; + leftBackEnergy; rightEnergy; + rightBackEnergy; centerSphere; start = () => { const {transform, gameObject} = this.props; + const shooterThickness = 0.5; // let geometry = new THREE.PlaneGeometry( 50, 50, 32 ); // let geometry = new THREE.TetrahedronGeometry( this.props.dimensions.x, 0 ); /* let geometry = new THREE.BoxGeometry( @@ -37,8 +40,8 @@ export class ShooterGeometry extends React.Component { path.lineTo(-1, .5); path.lineTo(0, 3); - let extrudeSettings = { - amount: .75, + const extrudeSettings = { + amount: shooterThickness, bevelEnabled: false, bevelSegments: 2, steps: 1, @@ -56,7 +59,6 @@ export class ShooterGeometry extends React.Component { transform.add(this.pointer); // left part - path = new THREE.Shape(); path.lineTo(-0.1, -1); @@ -64,16 +66,7 @@ export class ShooterGeometry extends React.Component { path.lineTo(-1, .4); path.lineTo(0.1, 0); path.lineTo(-0.1, -1); - - extrudeSettings = { - amount: .75, - bevelEnabled: false, - bevelSegments: 2, - steps: 1, - bevelSize: 1, - bevelThickness: 1 - }; - + geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); this.leftEnergy = new THREE.Mesh(geometry, material); @@ -82,6 +75,44 @@ export class ShooterGeometry extends React.Component { this.leftEnergy.castShadow=true; transform.add(this.leftEnergy); + //leftBackEnergy + + path = new THREE.Shape(); + + let baseX = -1; + let baseY = -0.55; + const distance = 0.4; + + path.moveTo(baseX, baseY); + path.lineTo(baseX, baseY); + path.lineTo(baseX-distance, baseY); + path.lineTo(baseX-distance, baseY-distance); + path.lineTo(baseX, baseY-distance); + path.lineTo(baseX, baseY); + + + geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); + this.leftBackEnergy = new THREE.Mesh(geometry, material); + transform.add(this.leftBackEnergy); + + //rigthBackEnergy + + path = new THREE.Shape(); + + baseX = -baseX; + baseY = baseY * 2 + 0.135; + + path.moveTo(baseX, baseY); + path.lineTo(baseX, baseY); + path.lineTo(baseX+distance, baseY); + path.lineTo(baseX+distance, baseY+distance); + path.lineTo(baseX, baseY+distance); + path.lineTo(baseX, baseY); + + geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); + this.rightBackEnergy = new THREE.Mesh(geometry, material); + transform.add(this.rightBackEnergy); + // right part path = new THREE.Shape(); @@ -92,15 +123,6 @@ export class ShooterGeometry extends React.Component { path.lineTo(0.1, 0); path.lineTo(0.1, -1); - extrudeSettings = { - amount: .75, - bevelEnabled: false, - bevelSegments: 2, - steps: 1, - bevelSize: 1, - bevelThickness: 1 - }; - geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); this.rightEnergy = new THREE.Mesh(geometry, material); @@ -113,7 +135,7 @@ export class ShooterGeometry extends React.Component { material = new THREE.MeshLambertMaterial({color: 0x666666}); this.centerSphere = new THREE.Mesh(geometry, material); - this.centerSphere.position.set(0, 0, .5); + this.centerSphere.position.set(0, 0, 0.3); transform.add(this.centerSphere); diff --git a/src/stores/initialState.js b/src/stores/initialState.js index 0d88e86..8c27520 100644 --- a/src/stores/initialState.js +++ b/src/stores/initialState.js @@ -212,7 +212,7 @@ export const initialState = { soundLocation: './assets/sounds/348162__djfroyd__laser-one-shot-3.wav' }, shooterGeometry:{ - dimensions:{ x: 2, y: 2, z: 2 }, + dimensions:{ x: 2, y: 2, z: 1 }, // position:{ x: 0, y: 0, z: 4 }, mass: 1 }, From 46068a3cb1a9b4a6d876a8c776e2428ccae2f939 Mon Sep 17 00:00:00 2001 From: Rui Orey Date: Sun, 1 Mar 2020 18:10:36 +0000 Subject: [PATCH 2/3] adds changes from commit "Improved shooter design" from 36868af73606c030e50f276a159a1b3740c8b4d4 --- .../PlayerShooterGeometry.js | 63 ++++++++++++------- src/stores/initialScene.js | 3 +- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/renderer/Core/GameComponents/PlayerShooterGeometry/PlayerShooterGeometry.js b/src/renderer/Core/GameComponents/PlayerShooterGeometry/PlayerShooterGeometry.js index acf59a3..ef91d2a 100644 --- a/src/renderer/Core/GameComponents/PlayerShooterGeometry/PlayerShooterGeometry.js +++ b/src/renderer/Core/GameComponents/PlayerShooterGeometry/PlayerShooterGeometry.js @@ -12,7 +12,7 @@ export class PlayerShooterGeometry extends React.Component { centerSphere; start = () => { - const { transform, gameObject } = this.props; + const { transform, gameObject, shooterThickness } = this.props; // let geometry = new THREE.PlaneGeometry( 50, 50, 32 ); // let geometry = new THREE.TetrahedronGeometry( this.props.dimensions.x, 0 ); /* let geometry = new THREE.BoxGeometry( @@ -36,7 +36,7 @@ export class PlayerShooterGeometry extends React.Component { path.lineTo(0, 3); let extrudeSettings = { - amount: 0.75, + amount: shooterThickness || .75, bevelEnabled: false, bevelSegments: 2, steps: 1, @@ -62,15 +62,6 @@ export class PlayerShooterGeometry extends React.Component { path.lineTo(0.1, 0); path.lineTo(-0.1, -1); - extrudeSettings = { - amount: 0.75, - bevelEnabled: false, - bevelSegments: 2, - steps: 1, - bevelSize: 1, - bevelThickness: 1 - }; - geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); this.leftEnergy = new THREE.Mesh(geometry, material); @@ -89,15 +80,6 @@ export class PlayerShooterGeometry extends React.Component { path.lineTo(0.1, 0); path.lineTo(0.1, -1); - extrudeSettings = { - amount: 0.75, - bevelEnabled: false, - bevelSegments: 2, - steps: 1, - bevelSize: 1, - bevelThickness: 1 - }; - geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); this.rightEnergy = new THREE.Mesh(geometry, material); @@ -106,11 +88,50 @@ export class PlayerShooterGeometry extends React.Component { this.rightEnergy.castShadow = true; transform.add(this.rightEnergy); + //leftBackEnergy + + path = new THREE.Shape(); + + let baseX = -1; + let baseY = -0.55; + const distance = 0.4; + + path.moveTo(baseX, baseY); + path.lineTo(baseX, baseY); + path.lineTo(baseX-distance, baseY); + path.lineTo(baseX-distance, baseY-distance); + path.lineTo(baseX, baseY-distance); + path.lineTo(baseX, baseY); + + + geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); + this.leftBackEnergy = new THREE.Mesh(geometry, material); + transform.add(this.leftBackEnergy); + + //rigthBackEnergy + + path = new THREE.Shape(); + + baseX = -baseX; + baseY = baseY * 2 + 0.135; + + path.moveTo(baseX, baseY); + path.lineTo(baseX, baseY); + path.lineTo(baseX+distance, baseY); + path.lineTo(baseX+distance, baseY+distance); + path.lineTo(baseX, baseY+distance); + path.lineTo(baseX, baseY); + + geometry = new THREE.ExtrudeGeometry(path, extrudeSettings); + this.rightBackEnergy = new THREE.Mesh(geometry, material); + transform.add(this.rightBackEnergy); + + geometry = new THREE.SphereGeometry(0.5, 32, 32); material = new THREE.MeshLambertMaterial({ color: 0x666666 }); this.centerSphere = new THREE.Mesh(geometry, material); - this.centerSphere.position.set(0, 0, 0.5); + this.centerSphere.position.set(0, 0, 0.3); transform.add(this.centerSphere); this.props.availableService.physics.addNewBoxBody( diff --git a/src/stores/initialScene.js b/src/stores/initialScene.js index 9299365..35d43fc 100644 --- a/src/stores/initialScene.js +++ b/src/stores/initialScene.js @@ -272,7 +272,8 @@ export const initialScene = { selfDestructTime: 2000, }, shooterGeometry: { - dimensions: { x: 2, y: 2, z: 2 }, + shooterThickness: 0.5, + dimensions: { x: 2, y: 2, z: 1 }, // position:{ x: 0, y: 0, z: 4 }, mass: 1 } From 0c933b0002ab6803c7f16d85548446cd1035d0d7 Mon Sep 17 00:00:00 2001 From: Rui Orey Date: Sat, 7 Mar 2020 17:34:24 +0000 Subject: [PATCH 3/3] builds homepage set to "." --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0493e25..aa71b43 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "yorhajs", "version": "0.1.0", "private": true, + "homepage": ".", "dependencies": { "@tweenjs/tween.js": "^17.2.0", "cannon": "github:schteppe/cannon.js",