mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
fix sky black void
This commit is contained in:
parent
f36ae0b9ab
commit
37b246e034
5 changed files with 8 additions and 4 deletions
BIN
marblegame.hl
BIN
marblegame.hl
Binary file not shown.
|
|
@ -261,6 +261,8 @@ class CameraController extends Object {
|
|||
|
||||
if (!oob)
|
||||
lastCamPos = camera.pos;
|
||||
|
||||
this.setPosition(camera.pos.x, camera.pos.y, camera.pos.z);
|
||||
// camera.target = null;
|
||||
// camera.target = targetpos.add(cameraVerticalTranslation);
|
||||
// this.x = targetpos.x + directionVec.x;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package;
|
||||
|
||||
import hxd.Timer;
|
||||
import hxd.Window;
|
||||
import src.AudioManager;
|
||||
import src.Settings;
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ class Marble extends GameObject {
|
|||
var soFar = 0.0;
|
||||
for (k in 0...contacts.length) {
|
||||
var dist = this._radius - contacts[k].contactDistance;
|
||||
var timeToSeparate = 0.064;
|
||||
var timeToSeparate = 0.032;
|
||||
if (dist >= 0) {
|
||||
var f1 = this.velocity.sub(contacts[k].velocity).add(dir.multiply(soFar)).dot(contacts[k].normal);
|
||||
var f2 = timeToSeparate * f1;
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ class MarbleWorld extends Scheduler {
|
|||
this.marble.camera.finish = false;
|
||||
this.marble.mode = Start;
|
||||
this.marble.startPad = cast startquat.pad;
|
||||
sky.follow = marble;
|
||||
sky.follow = marble.camera;
|
||||
|
||||
var missionInfo:MissionElementScriptObject = cast this.mission.root.elements.filter((element) -> element._type == MissionElementType.ScriptObject
|
||||
&& element._name == "MissionInfo")[0];
|
||||
|
|
@ -628,7 +628,8 @@ class MarbleWorld extends Scheduler {
|
|||
this.scene.addChild(marble.camera);
|
||||
this.marble = marble;
|
||||
// Ugly hack
|
||||
sky.follow = marble;
|
||||
// sky.follow = marble;
|
||||
sky.follow = marble.camera;
|
||||
}
|
||||
this.collisionWorld.addMovingEntity(marble.collider);
|
||||
this.scene.addChild(marble);
|
||||
|
|
@ -970,7 +971,7 @@ class MarbleWorld extends Scheduler {
|
|||
this.outOfBounds = true;
|
||||
this.outOfBoundsTime = this.timeState.clone();
|
||||
this.marble.camera.oob = true;
|
||||
sky.follow = null;
|
||||
// sky.follow = null;
|
||||
// this.oobCameraPosition = camera.position.clone();
|
||||
playGui.setCenterText('outofbounds');
|
||||
AudioManager.playSound(ResourceLoader.getAudio('data/sound/whoosh.wav'));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue