diff --git a/Archer/Archer_finalrig.ugh b/Archer/Archer_finalrig.ugh index 66ee8b2..80e740a 100644 Binary files a/Archer/Archer_finalrig.ugh and b/Archer/Archer_finalrig.ugh differ diff --git a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3o b/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3o index 7de6419..52b05d9 100644 Binary files a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3o and b/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3o differ diff --git a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3odata b/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3odata index 6dcbcb7..c0a0dc6 100644 --- a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3odata +++ b/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.j3odata @@ -1,3 +1,3 @@ # -#Thu Jun 13 01:11:59 KST 2019 -ORIGINAL_PATH=Models/Archer_finalrig/Archer_finalrig.obj +#Thu Jun 13 01:32:08 KST 2019 +ORIGINAL_PATH=Models/Archer_finalrig/Archer_finalrig.mesh.xml diff --git a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.mesh.j3o b/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.mesh.j3o deleted file mode 100644 index 52b05d9..0000000 Binary files a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.mesh.j3o and /dev/null differ diff --git a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.mesh.j3odata b/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.mesh.j3odata deleted file mode 100644 index c0a0dc6..0000000 --- a/SigDN/assets/Models/Archer_finalrig/Archer_finalrig.mesh.j3odata +++ /dev/null @@ -1,3 +0,0 @@ -# -#Thu Jun 13 01:32:08 KST 2019 -ORIGINAL_PATH=Models/Archer_finalrig/Archer_finalrig.mesh.xml diff --git a/SigDN/src/mygame/GenericFunctions.java b/SigDN/src/mygame/GenericFunctions.java new file mode 100644 index 0000000..036f5f8 --- /dev/null +++ b/SigDN/src/mygame/GenericFunctions.java @@ -0,0 +1,32 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package mygame; + +import com.jme3.asset.AssetManager; +import com.jme3.scene.Spatial; + +/** + * + * @author Joshua Sigona + */ +public class GenericFunctions { + /** + * Specify a model name. Returns the entire path. + * @return + */ + public static String ModelName(String name) { + StringBuilder sb = new StringBuilder("Models/") + .append(name) + .append("/") + .append(name) + .append(".j3o"); + return sb.toString(); + } + + public static Spatial LoadModel(AssetManager assetManager, String name) { + return (Spatial)(assetManager.loadModel(ModelName(name))); + } +} diff --git a/SigDN/src/mygame/Main.java b/SigDN/src/mygame/Main.java index 765083e..e34ba5c 100644 --- a/SigDN/src/mygame/Main.java +++ b/SigDN/src/mygame/Main.java @@ -26,7 +26,7 @@ import com.jme3.scene.Node; * @author normenhansen */ public class Main extends SimpleApplication implements - AnimEventListener{ + AnimEventListener, ActionListener{ public static Main game; private AnimChannel channel; private AnimControl control; @@ -61,7 +61,7 @@ public class Main extends SimpleApplication implements dl2.setColor(new ColorRGBA(1f, 1f, 1f, 0.5f)); dl2.setDirection(new Vector3f(0.1f, -0.7f, -1).normalizeLocal()); rootNode.addLight(dl2); - Spatial Archer = (Spatial) assetManager.loadModel("Models/Archer_finalrig/Archer_finalrig.mesh.j3o"); + Spatial Archer = (Spatial) assetManager.loadModel("Models/Archer_finalrig/Archer_finalrig.j3o"); float scale = 0.05f; Archer.scale(scale, scale, scale); @@ -97,10 +97,10 @@ public class Main extends SimpleApplication implements rootNode.attachChild(Archer); //rootNode.attachChild(bow); - inputManager.addMapping("Swap Weapon", - new KeyTrigger(KeyInput.KEY_SPACE)); + inputManager.addMapping("Combat Stance", + new KeyTrigger(KeyInput.KEY_TAB)); - ActionListener actionListener = new ActionListener(){ + /*ActionListener actionListener = new ActionListener(){ public void onAction(String name, boolean pressed, float tpf){ if (pressed) { n.detachChild(bow); @@ -117,14 +117,14 @@ public class Main extends SimpleApplication implements n.attachChild(bow); } } - }; + };*/ - inputManager.addListener(actionListener, "Swap Weapon"); + inputManager.addListener(this, "Combat Stance"); } @Override public void simpleUpdate(float tpf) { - //TODO: add update code + System.out.println(tpf); } @Override @@ -139,4 +139,15 @@ public class Main extends SimpleApplication implements @Override public void onAnimChange(AnimControl control, AnimChannel channel, String animName) { } + + @Override + public void onAction(String name, boolean isPressed, float tpf) { + switch (name) { + case "Combat Stance":{ + if (isPressed) { + // + } + }break; + } + } } diff --git a/SigDN/src/mygame/character/CharacterRig.java b/SigDN/src/mygame/character/CharacterRig.java new file mode 100644 index 0000000..803f64a --- /dev/null +++ b/SigDN/src/mygame/character/CharacterRig.java @@ -0,0 +1,60 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package mygame.character; + +import com.jme3.animation.AnimChannel; +import com.jme3.animation.AnimControl; +import com.jme3.animation.SkeletonControl; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; +import mygame.GenericFunctions; +import mygame.Main; + +/** + * + * @author Joshua Sigona + */ +public class CharacterRig extends Main{ + Spatial character; + String[] topbones; //Controlled only by top motion. Anything not specified here is bottom control. + AnimChannel top_channel,bot_channel; + AnimControl control; + SkeletonControl skeleton; + + Node primary_hand,secondary_hand,torso; + + Spatial weapon; + + boolean combat_stance=false; + + //Combat stance + + CharacterRig(String model,String... topbones) { + this.character = GenericFunctions.LoadModel(assetManager,model); + this.topbones = topbones; + + control = character.getControl(AnimControl.class); + control.addListener(Main.game); + bot_channel = control.createChannel(); + top_channel = control.createChannel(); + + SkeletonControl skeleton = character.getControl(SkeletonControl.class); + + primary_hand = skeleton.getAttachmentsNode("Left Wrist"); + secondary_hand = skeleton.getAttachmentsNode("Right Wrist"); + torso = skeleton.getAttachmentsNode("Torso"); + } + + public void setWeapon(Spatial weapon) { + this.weapon=weapon; + } + + + public void update(float tpf) { + + } + +} diff --git a/archer_skill_siegestance_01_foot.wav b/archer_skill_siegestance_01_foot.wav new file mode 100644 index 0000000..d28cded Binary files /dev/null and b/archer_skill_siegestance_01_foot.wav differ diff --git a/archer_skill_siegestance_02_foot.wav b/archer_skill_siegestance_02_foot.wav new file mode 100644 index 0000000..727f2ff Binary files /dev/null and b/archer_skill_siegestance_02_foot.wav differ diff --git a/archer_skill_siegestance_03_charge.wav b/archer_skill_siegestance_03_charge.wav new file mode 100644 index 0000000..10cb274 Binary files /dev/null and b/archer_skill_siegestance_03_charge.wav differ diff --git a/archer_skill_siegestance_04_fire.wav b/archer_skill_siegestance_04_fire.wav new file mode 100644 index 0000000..6260718 Binary files /dev/null and b/archer_skill_siegestance_04_fire.wav differ diff --git a/archer_skill_spyralvoltex_01_intro.wav b/archer_skill_spyralvoltex_01_intro.wav new file mode 100644 index 0000000..de8dd8a Binary files /dev/null and b/archer_skill_spyralvoltex_01_intro.wav differ diff --git a/dragon nest_bgm_80lv_stage1.ogg b/dragon nest_bgm_80lv_stage1.ogg new file mode 100644 index 0000000..331c6e2 Binary files /dev/null and b/dragon nest_bgm_80lv_stage1.ogg differ diff --git a/dragon nest_bgm_battle_guardian_boss.ogg b/dragon nest_bgm_battle_guardian_boss.ogg new file mode 100644 index 0000000..786b4ea Binary files /dev/null and b/dragon nest_bgm_battle_guardian_boss.ogg differ diff --git a/dragon nest_bgm_field_alteia.ogg b/dragon nest_bgm_field_alteia.ogg new file mode 100644 index 0000000..c464c1b Binary files /dev/null and b/dragon nest_bgm_field_alteia.ogg differ diff --git a/dragon nest_bgm_field_anuarendel.ogg b/dragon nest_bgm_field_anuarendel.ogg new file mode 100644 index 0000000..599befb Binary files /dev/null and b/dragon nest_bgm_field_anuarendel.ogg differ diff --git a/player_archer2_skna_01_a.wav b/player_archer2_skna_01_a.wav new file mode 100644 index 0000000..ea2cd64 Binary files /dev/null and b/player_archer2_skna_01_a.wav differ diff --git a/player_archer2_skna_01_b.wav b/player_archer2_skna_01_b.wav new file mode 100644 index 0000000..9aa845b Binary files /dev/null and b/player_archer2_skna_01_b.wav differ diff --git a/player_archer2_skna_34_a.wav b/player_archer2_skna_34_a.wav new file mode 100644 index 0000000..6cd93e3 Binary files /dev/null and b/player_archer2_skna_34_a.wav differ diff --git a/player_archer2_sksp_43_k.wav b/player_archer2_sksp_43_k.wav new file mode 100644 index 0000000..f0a2183 Binary files /dev/null and b/player_archer2_sksp_43_k.wav differ diff --git a/player_archer2_so_13_g.wav b/player_archer2_so_13_g.wav new file mode 100644 index 0000000..ec42813 Binary files /dev/null and b/player_archer2_so_13_g.wav differ diff --git a/player_archer2_social_01_a.wav b/player_archer2_social_01_a.wav new file mode 100644 index 0000000..7a69252 Binary files /dev/null and b/player_archer2_social_01_a.wav differ diff --git a/player_archer2_social_01_b.wav b/player_archer2_social_01_b.wav new file mode 100644 index 0000000..2c0dfb5 Binary files /dev/null and b/player_archer2_social_01_b.wav differ diff --git a/player_archer3_bvh_01_a.ogg b/player_archer3_bvh_01_a.ogg new file mode 100644 index 0000000..d41b905 Binary files /dev/null and b/player_archer3_bvh_01_a.ogg differ diff --git a/player_archer4_sksp01_01.ogg b/player_archer4_sksp01_01.ogg new file mode 100644 index 0000000..7ff4409 Binary files /dev/null and b/player_archer4_sksp01_01.ogg differ diff --git a/player_archer4_sksp04_03.ogg b/player_archer4_sksp04_03.ogg new file mode 100644 index 0000000..7ff4409 Binary files /dev/null and b/player_archer4_sksp04_03.ogg differ diff --git a/player_archer_bva_01_a.wav b/player_archer_bva_01_a.wav new file mode 100644 index 0000000..65e14ff Binary files /dev/null and b/player_archer_bva_01_a.wav differ