thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix sounds

Browse source
This commit is contained in:
RandomityGuy 2021-07-19 11:30:21 +05:30
parent fa8848cbae
commit 185366ba94
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
marblegame.hl
View file

Binary file not shown.

3
src/CameraController.hx
View file

@ -256,9 +256,6 @@ class CameraController extends Object {
var rightVec = camera.up.cross(forwardVec).normalized(); var rightVec = camera.up.cross(forwardVec).normalized();
var upVec = forwardVec.cross(rightVec); var upVec = forwardVec.cross(rightVec);
var cameraQuat = new Quat();
cameraQuat.initDirection(camera.target.sub(camera.pos).normalized());
camera.target = marblePosition.add(upVec.multiply(0.3)); camera.target = marblePosition.add(upVec.multiply(0.3));
camera.up = upVec; camera.up = upVec;
continue; continue;

3
src/collision/CollisionEntity.hx
View file

@ -11,6 +11,7 @@ import h3d.Vector;
import octree.IOctreeObject; import octree.IOctreeObject;
import h3d.Matrix; import h3d.Matrix;
import h3d.col.Bounds; import h3d.col.Bounds;
import src.PathedInterior;
class CollisionEntity implements IOctreeObject { class CollisionEntity implements IOctreeObject {
public var boundingBox:Bounds; public var boundingBox:Bounds;
@ -94,7 +95,7 @@ class CollisionEntity implements IOctreeObject {
var radius = collisionEntity.radius; var radius = collisionEntity.radius;
var invMatrix = invTransform; var invMatrix = invTransform;
if (this.velocity.lengthSq() != 0) if (this.go is PathedInterior)
invMatrix = transform.getInverse(); invMatrix = transform.getInverse();
var sphereBounds = new Bounds(); var sphereBounds = new Bounds();
var localPos = position.clone(); var localPos = position.clone();

2
src/shapes/DuctFan.hx
View file

@ -31,7 +31,7 @@ class DuctFan extends ForceObject {
public override function init(level:src.MarbleWorld) { public override function init(level:src.MarbleWorld) {
super.init(level); super.init(level);
this.soundChannel = AudioManager.playSound(ResourceLoader.getAudio("data/sound/fan_loop.wav"), this.getAbsPos().getPosition(), true); this.soundChannel = AudioManager.playSound(ResourceLoader.getAudio("data/sound/fan_loop.wav"), new Vector(1e8, 1e8, 1e8), true);
} }
public override function update(timeState:src.TimeState) { public override function update(timeState:src.TimeState) {

2
src/shapes/SmallDuctFan.hx
View file

@ -31,7 +31,7 @@ class SmallDuctFan extends ForceObject {
public override function init(level:src.MarbleWorld) { public override function init(level:src.MarbleWorld) {
super.init(level); super.init(level);
this.soundChannel = AudioManager.playSound(ResourceLoader.getAudio("data/sound/fan_loop.wav"), this.getAbsPos().getPosition(), true); this.soundChannel = AudioManager.playSound(ResourceLoader.getAudio("data/sound/fan_loop.wav"), new Vector(1e8, 1e8, 1e8), true);
} }
public override function update(timeState:src.TimeState) { public override function update(timeState:src.TimeState) {

2
src/shapes/Tornado.hx
View file

@ -46,7 +46,7 @@ class Tornado extends ForceObject {
public override function init(level:src.MarbleWorld) { public override function init(level:src.MarbleWorld) {
super.init(level); super.init(level);
this.soundChannel = AudioManager.playSound(ResourceLoader.getAudio("data/sound/tornado.wav"), this.getAbsPos().getPosition(), true); this.soundChannel = AudioManager.playSound(ResourceLoader.getAudio("data/sound/tornado.wav"), new Vector(1e8, 1e8, 1e8), true);
for (material in this.materials) { for (material in this.materials) {
material.blendMode = Alpha; material.blendMode = Alpha;
material.mainPass.culling = h3d.mat.Data.Face.None; material.mainPass.culling = h3d.mat.Data.Face.None;