Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-10 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build errors

Browse source
This commit is contained in:
KillzXGaming 2019-11-23 16:09:56 -05:00
parent 940994604a
commit bb5599bfd7
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
File_Format_Library/Resources/Hashes/Pkmn.txt
View file

@ -1,4 +1,8 @@
bin/pokemon/pm0000_00/mdl/pm0000_00.gfbmdl
bin/chara/data/pc/p1/p1_base_app01/anm/pc0002_00_fa0004_eye_close01.gfbanm
bin/chara/data/pc/p1/p1_base_app01/anm/pc0002_00_fi0001_wait01_loop.gfbanm
bin/chara/data/pc/p2/p1_base_app01/anm/pc0002_00_fa0004_eye_close01.gfbanm
bin/chara/data/pc/p2/p1_base_app01/anm/pc0002_00_fi0001_wait01_loop.gfbanm
bin/pokemon/pm0000_00/mdl/pm0000_00.gfbmdl
bin/pokemon/pm0000_00/mdl/pm0000_00_rare.gfbmdl
bin/pokemon/pm0000_00/pm0000_00.gfbpokecfg
bin/pokemon/pm0000_00/anm/pm0000_00_field01.gfbanmcfg
@ -66,3 +70,7 @@ bin/pokemon/pm0000_00/anm/pm0000_00_kw50_eatA01.gfbanm
bin/pokemon/pm0000_00/anm/pm0000_00_kw50_eatB01.gfbanm
bin/pokemon/pm0000_00/anm/pm0000_00_kw50_eatC01.gfbanm
bin/pokemon/pm0000_00/anm/pm0000_00_kw60_touch01.gfbanm
bin/chara/data/pc/p1/anm
bin/chara/data/pc/p1/mdl
bin/archive/chara/data/pc/p1/anm
bin/archive/chara/data/pc/p1/mdl

14
Switch_Toolbox_Library/Animations/SceneAnimation.cs
View file

@ -81,19 +81,19 @@ namespace Toolbox.Library.Animations
if (viewport.GL_ControlModern != null)
if (viewport.GL_Control != null)
{
Console.WriteLine($"Camera {Frame} {ClipNear} {ClipFar} {AspectRatio} {FieldOfView} {new Vector3(posX, posY, posZ)} {new Vector3(rotX, rotY, rotZ)}");
var matrix = CalculateMatrix(new Vector3(posX, posY, posZ), new Vector3(rotX, rotY, rotZ), Twist);
var quat = matrix.ExtractRotation();
viewport.GL_ControlModern.CameraTarget = new Vector3(posX, posY, posZ);
viewport.GL_ControlModern.CamRotX = MathHelper.DegreesToRadians(rotX);
viewport.GL_ControlModern.CamRotY = MathHelper.DegreesToRadians(rotY);
viewport.GL_ControlModern.Fov = FieldOfView;
viewport.GL_ControlModern.ZNear = ClipNear;
viewport.GL_ControlModern.ZFar = ClipFar;
viewport.GL_Control.CameraTarget = new Vector3(posX, posY, posZ);
viewport.GL_Control.CamRotX = MathHelper.DegreesToRadians(rotX);
viewport.GL_Control.CamRotY = MathHelper.DegreesToRadians(rotY);
viewport.GL_Control.Fov = FieldOfView;
viewport.GL_Control.ZNear = ClipNear;
viewport.GL_Control.ZFar = ClipFar;
//Add frames to the playing animation
Frame += 1f;