mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-11-22 05:03:42 +00:00
video stuff in progress
This commit is contained in:
parent
4d27422c40
commit
9f9996154a
|
|
@ -40,6 +40,8 @@
|
||||||
|
|
||||||
<classpath name="source" />
|
<classpath name="source" />
|
||||||
|
|
||||||
|
<assets path='assets/preload/music' include="*mp4" embed='false' />
|
||||||
|
|
||||||
<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
|
<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
|
||||||
<assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web"/>
|
<assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web"/>
|
||||||
|
|
||||||
|
|
@ -120,6 +122,7 @@
|
||||||
<haxelib name="newgrounds"/>
|
<haxelib name="newgrounds"/>
|
||||||
<haxelib name="faxe" if='switch'/>
|
<haxelib name="faxe" if='switch'/>
|
||||||
<haxelib name="polymod"/>
|
<haxelib name="polymod"/>
|
||||||
|
<haxelib name="openfl-webm" />
|
||||||
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
|
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
|
||||||
|
|
||||||
<!-- <haxelib name="markdown" /> -->
|
<!-- <haxelib name="markdown" /> -->
|
||||||
|
|
|
||||||
BIN
assets/songs/stress/Inst.mp3
Normal file
BIN
assets/songs/stress/Inst.mp3
Normal file
Binary file not shown.
BIN
assets/songs/stress/Inst.ogg
Normal file
BIN
assets/songs/stress/Inst.ogg
Normal file
Binary file not shown.
BIN
assets/songs/stress/Voices.mp3
Normal file
BIN
assets/songs/stress/Voices.mp3
Normal file
Binary file not shown.
BIN
assets/songs/stress/Voices.ogg
Normal file
BIN
assets/songs/stress/Voices.ogg
Normal file
Binary file not shown.
|
|
@ -43,13 +43,11 @@ class FreeplayState extends MusicBeatState
|
||||||
songs.push(new SongMetadata(initSonglist[i], 1, 'gf'));
|
songs.push(new SongMetadata(initSonglist[i], 1, 'gf'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
if (FlxG.sound.music != null)
|
if (FlxG.sound.music != null)
|
||||||
{
|
{
|
||||||
if (!FlxG.sound.music.playing)
|
if (!FlxG.sound.music.playing)
|
||||||
FlxG.sound.playMusic(Paths.music('freakyMenu'));
|
FlxG.sound.playMusic(Paths.music('freakyMenu'));
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
var isDebug:Bool = false;
|
var isDebug:Bool = false;
|
||||||
|
|
||||||
|
|
@ -179,10 +177,13 @@ class FreeplayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
super.update(elapsed);
|
super.update(elapsed);
|
||||||
|
|
||||||
|
if (FlxG.sound.music != null)
|
||||||
|
{
|
||||||
if (FlxG.sound.music.volume < 0.7)
|
if (FlxG.sound.music.volume < 0.7)
|
||||||
{
|
{
|
||||||
FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
|
FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
|
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
|
||||||
bg.color = FlxColor.interpolate(bg.color, coolColors[curSelected % coolColors.length], 0.045);
|
bg.color = FlxColor.interpolate(bg.color, coolColors[curSelected % coolColors.length], 0.045);
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,13 @@ import openfl.Assets;
|
||||||
import openfl.Lib;
|
import openfl.Lib;
|
||||||
import openfl.display.FPS;
|
import openfl.display.FPS;
|
||||||
import openfl.display.Sprite;
|
import openfl.display.Sprite;
|
||||||
|
import openfl.events.AsyncErrorEvent;
|
||||||
import openfl.events.Event;
|
import openfl.events.Event;
|
||||||
|
import openfl.events.MouseEvent;
|
||||||
|
import openfl.events.NetStatusEvent;
|
||||||
|
import openfl.media.Video;
|
||||||
|
import openfl.net.NetConnection;
|
||||||
|
import openfl.net.NetStream;
|
||||||
|
|
||||||
class Main extends Sprite
|
class Main extends Sprite
|
||||||
{
|
{
|
||||||
|
|
@ -49,6 +55,10 @@ class Main extends Sprite
|
||||||
setupGame();
|
setupGame();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var video:Video;
|
||||||
|
var netStream:NetStream;
|
||||||
|
private var overlay:Sprite;
|
||||||
|
|
||||||
private function setupGame():Void
|
private function setupGame():Void
|
||||||
{
|
{
|
||||||
var stageWidth:Int = Lib.current.stage.stageWidth;
|
var stageWidth:Int = Lib.current.stage.stageWidth;
|
||||||
|
|
@ -72,5 +82,52 @@ class Main extends Sprite
|
||||||
#if !mobile
|
#if !mobile
|
||||||
addChild(new FPS(10, 3, 0xFFFFFF));
|
addChild(new FPS(10, 3, 0xFFFFFF));
|
||||||
#end
|
#end
|
||||||
|
/*
|
||||||
|
video = new Video();
|
||||||
|
addChild(video);
|
||||||
|
|
||||||
|
var netConnection = new NetConnection();
|
||||||
|
netConnection.connect(null);
|
||||||
|
|
||||||
|
netStream = new NetStream(netConnection);
|
||||||
|
netStream.client = {onMetaData: client_onMetaData};
|
||||||
|
netStream.addEventListener(AsyncErrorEvent.ASYNC_ERROR, netStream_onAsyncError);
|
||||||
|
|
||||||
|
#if (js && html5)
|
||||||
|
overlay = new Sprite();
|
||||||
|
overlay.graphics.beginFill(0, 0.5);
|
||||||
|
overlay.graphics.drawRect(0, 0, 560, 320);
|
||||||
|
overlay.addEventListener(MouseEvent.MOUSE_DOWN, overlay_onMouseDown);
|
||||||
|
overlay.buttonMode = true;
|
||||||
|
addChild(overlay);
|
||||||
|
|
||||||
|
netConnection.addEventListener(NetStatusEvent.NET_STATUS, netConnection_onNetStatus);
|
||||||
|
#else
|
||||||
|
netStream.play("assets/preload/music/dredd.mp4");
|
||||||
|
#end
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
private function client_onMetaData(metaData:Dynamic)
|
||||||
|
{
|
||||||
|
video.attachNetStream(netStream);
|
||||||
|
|
||||||
|
video.width = video.videoWidth;
|
||||||
|
video.height = video.videoHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function netStream_onAsyncError(event:AsyncErrorEvent):Void
|
||||||
|
{
|
||||||
|
trace("Error loading video");
|
||||||
|
}
|
||||||
|
|
||||||
|
private function netConnection_onNetStatus(event:NetStatusEvent):Void
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
private function overlay_onMouseDown(event:MouseEvent):Void
|
||||||
|
{
|
||||||
|
netStream.play("assets/preload/music/dredd.mp4");
|
||||||
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,20 +2,14 @@ package;
|
||||||
|
|
||||||
import flixel.FlxG;
|
import flixel.FlxG;
|
||||||
import flixel.FlxSprite;
|
import flixel.FlxSprite;
|
||||||
import flixel.FlxState;
|
|
||||||
import flixel.addons.display.FlxGridOverlay;
|
|
||||||
import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
|
import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
|
||||||
import flixel.addons.transition.FlxTransitionableState;
|
import flixel.addons.transition.FlxTransitionableState;
|
||||||
import flixel.addons.transition.TransitionData;
|
import flixel.addons.transition.TransitionData;
|
||||||
import flixel.graphics.FlxGraphic;
|
import flixel.graphics.FlxGraphic;
|
||||||
import flixel.graphics.frames.FlxAtlasFrames;
|
|
||||||
import flixel.group.FlxGroup;
|
import flixel.group.FlxGroup;
|
||||||
import flixel.input.gamepad.FlxGamepad;
|
import flixel.input.gamepad.FlxGamepad;
|
||||||
import flixel.math.FlxPoint;
|
import flixel.math.FlxPoint;
|
||||||
import flixel.math.FlxRect;
|
import flixel.math.FlxRect;
|
||||||
import flixel.system.FlxSound;
|
|
||||||
import flixel.system.ui.FlxSoundTray;
|
|
||||||
import flixel.text.FlxText;
|
|
||||||
import flixel.tweens.FlxEase;
|
import flixel.tweens.FlxEase;
|
||||||
import flixel.tweens.FlxTween;
|
import flixel.tweens.FlxTween;
|
||||||
import flixel.util.FlxColor;
|
import flixel.util.FlxColor;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue