Skip to content

Commit

Permalink
Feat:add junit5 lib and test sound
Browse files Browse the repository at this point in the history
  • Loading branch information
@tjdvlf2880
tjdvlf2880 committed Nov 26, 2023
1 parent ec91d04 commit 0eb9719
Show file tree
Hide file tree
Showing 44 changed files with 1,255 additions and 2,198 deletions.
Binary file added Lib/junit-platform-console-standalone-1.8.2.jar
View file
Binary file not shown.
809 changes: 0 additions & 809 deletions log
View file

This file was deleted.

Empty file removed log.lck
View file
Empty file.
2 changes: 1 addition & 1 deletion res/DataBase
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"AAA":{"Money":5,"StoreItem":{"MoveSpeed":true,"ShotSpeed":false,"BonusLife":false},"Setting":{"Volume":0.0,"IsMute":false,"KeySetting_1p":[37,39,38,40,10],"KeySetting_2p":[65,68,87,83,32]},"Achievement":{"LUCKY_GUY":false,"GAME_ACE":false,"SOUL_MATES":false,"BUDDY_FXXKER":false,"PAT_AND_MAT":false,"ADVENTURE_START":true,"DEADLY_ACCURACY":false,"AVIOPHOBIA":false,"SHARP_SHOOTER":true,"UNLUCKY_GUY":false}},"Scores":{"Scores_1p":[{"name":"AAA","value":660},{"name":"AAA","value":660},{"name":"AAA","value":180},{"name":"AAA","value":120},{"name":"ZAA","value":0},{"name":"YAA","value":0},{"name":"YAA","value":0},{"name":"YAA","value":0},{"name":"AAA","value":0},{"name":"AAA","value":0}],"Scores_2p":[{"name":"AAA","value":120},{"name":"AAA","value":120},{"name":"AAA","value":60}]},"YAA":{"Money":0,"StoreItem":{"MoveSpeed":false,"ShotSpeed":false,"BonusLife":false},"Setting":{"Volume":0,"IsMute":false,"KeySetting_1p":[0,1,2,3,4],"KeySetting_2p":[8,9,10,11,12]},"Achievement":{"LUCKY_GUY":false,"GAME_ACE":false,"SOUL_MATES":false,"BUDDY_FXXKER":false,"PAT_AND_MAT":false,"ADVENTURE_START":true,"DEADLY_ACCURACY":false,"AVIOPHOBIA":false,"SHARP_SHOOTER":false,"UNLUCKY_GUY":false}},"ZAA":{"Money":0,"StoreItem":{"MoveSpeed":false,"ShotSpeed":false,"BonusLife":false},"Setting":{"Volume":0,"IsMute":false,"KeySetting_1p":[0,1,2,3,4],"KeySetting_2p":[8,9,10,11,12]},"Achievement":{"LUCKY_GUY":false,"GAME_ACE":false,"SOUL_MATES":false,"BUDDY_FXXKER":false,"PAT_AND_MAT":false,"ADVENTURE_START":true,"DEADLY_ACCURACY":false,"AVIOPHOBIA":false,"SHARP_SHOOTER":false,"UNLUCKY_GUY":false}}}
{"AAA":{"Money":6,"StoreItem":{"MoveSpeed":false,"ShotSpeed":false,"BonusLife":false},"Setting":{"Volume":0.0,"IsMute":false,"KeySetting_1p":[37,39,38,40,10],"KeySetting_2p":[65,68,87,83,32]},"Achievement":{"LUCKY_GUY":false,"GAME_ACE":false,"SOUL_MATES":false,"BUDDY_FXXKER":false,"PAT_AND_MAT":false,"ADVENTURE_START":true,"DEADLY_ACCURACY":false,"AVIOPHOBIA":false,"SHARP_SHOOTER":true,"UNLUCKY_GUY":false}},"BAA":{"Money":0,"StoreItem":{"MoveSpeed":false,"ShotSpeed":false,"BonusLife":false},"Setting":{"Volume":0,"IsMute":false,"KeySetting_1p":[0,1,2,3,4],"KeySetting_2p":[8,9,10,11,12]},"Achievement":{"LUCKY_GUY":false,"GAME_ACE":false,"SOUL_MATES":false,"BUDDY_FXXKER":false,"PAT_AND_MAT":false,"ADVENTURE_START":false,"DEADLY_ACCURACY":false,"AVIOPHOBIA":false,"SHARP_SHOOTER":false,"UNLUCKY_GUY":false}},"Scores":{"Scores_1p":[{"name":"AAA","value":660},{"name":"AAA","value":660},{"name":"AAA","value":180},{"name":"AAA","value":120},{"name":"AAA","value":100},{"name":"ZAA","value":0},{"name":"YAA","value":0},{"name":"YAA","value":0},{"name":"YAA","value":0},{"name":"AAA","value":0}],"Scores_2p":[{"name":"AAA","value":120},{"name":"AAA","value":120},{"name":"AAA","value":60}]},"YAA":{"Money":0,"StoreItem":{"MoveSpeed":false,"ShotSpeed":false,"BonusLife":false},"Setting":{"Volume":0,"IsMute":false,"KeySetting_1p":[0,1,2,3,4],"KeySetting_2p":[8,9,10,11,12]},"Achievement":{"LUCKY_GUY":false,"GAME_ACE":false,"SOUL_MATES":false,"BUDDY_FXXKER":false,"PAT_AND_MAT":false,"ADVENTURE_START":true,"DEADLY_ACCURACY":false,"AVIOPHOBIA":false,"SHARP_SHOOTER":false,"UNLUCKY_GUY":false}},"ZAA":{"Money":0,"StoreItem":{"MoveSpeed":false,"ShotSpeed":false,"BonusLife":false},"Setting":{"Volume":0,"IsMute":false,"KeySetting_1p":[0,1,2,3,4],"KeySetting_2p":[8,9,10,11,12]},"Achievement":{"LUCKY_GUY":false,"GAME_ACE":false,"SOUL_MATES":false,"BUDDY_FXXKER":false,"PAT_AND_MAT":false,"ADVENTURE_START":true,"DEADLY_ACCURACY":false,"AVIOPHOBIA":false,"SHARP_SHOOTER":false,"UNLUCKY_GUY":false}}}
28 changes: 19 additions & 9 deletions src/EnginePrime/Component.java
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,44 @@
package EnginePrime;

import java.util.HashMap;
import java.util.Map;
import java.util.ArrayList;
import java.util.function.Consumer;

public abstract class Component {
int LifeStep = -1;
int RenderPrior = 1;
// 수신 이벤트 등록
public Map<String,Consumer<Message>> CustomEvent = new HashMap<>();
public Map<String, Consumer<Message>> CustomEvent = new HashMap<>();
public ArrayList<Message> MessagePool = new ArrayList<>();
public Entity Obj = null;

public void ProcMessage() {
if(LifeStep <2 ){
if (LifeStep < 2) {
return;
}
for (Message m : MessagePool) {
Consumer<Message> f = CustomEvent.get(m.obj.get("Func"));
if(f!=null){
if (f != null) {
f.accept(m);
}
}
MessagePool.clear();
}
public void SetRenderPrior(int p){

public void SetRenderPrior(int p) {
RenderPrior = p;
}

public void Awake(){};
public void Start(){};
public void Update(){};
public void Render(){};
}
public void Awake() {
};

public void Start() {
};

public void Update() {
};

public void Render() {
};
}
6 changes: 3 additions & 3 deletions src/EnginePrime/Core.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ public static void main(final String[] args) {
em.ProcMessage();
gm.frame.Render();
}

System.exit(0);
}

private Core() {}

private Core() {
}
}
64 changes: 32 additions & 32 deletions src/EnginePrime/EngineTimer.java
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,61 @@
package EnginePrime;
public class EngineTimer implements GManager{

public class EngineTimer implements GManager {
long previousTime;
long currentTime;
double elapsedSeconds;
double maxfps;

public void PreRender() {
};

public void LateRender() {
};

public void PreRender(){};

public void LateRender(){};
private EngineTimer(){
private EngineTimer() {
maxfps = 0;
};

public static EngineTimer instance = null;

public void Exit(){};
public void Exit() {
};

public static void ExecuteTimer(Runnable code, double time){
public static void ExecuteTimer(Runnable code, double time) {
new Thread(new Runnable() {
public void run() {
long prev = System.nanoTime();
double elapsed = 0;
while (elapsed < time) {
long cur = System.nanoTime() -prev;
long cur = System.nanoTime() - prev;
elapsed = cur / 1_000_000_000.0;
}
code.run();
}
}).start();

}).start();
}

public void Initialize(){
public void Initialize() {
Reset();
};

public void PreUpdate(){
public void PreUpdate() {
currentTime = System.nanoTime();
long elapsedTime = currentTime - previousTime;
elapsedSeconds = (double) elapsedTime / 1_000_000_000.0;
previousTime = currentTime;

double t = (maxfps - elapsedSeconds)*1000;

if(t>0){
try {
Thread.sleep((long)t);
} catch (Exception e) {
e.printStackTrace();
}
}
long elapsedTime = currentTime - previousTime;
elapsedSeconds = (double) elapsedTime / 1_000_000_000.0;
previousTime = currentTime;
double t = (maxfps - elapsedSeconds) * 1000;
if (t > 0) {
try {
Thread.sleep((long) t);
} catch (Exception e) {
e.printStackTrace();
}
}
};

public void LateUpdate(){};
public void LateUpdate() {
};

public static EngineTimer getInstance() {
if (instance == null) {
Expand All @@ -63,18 +64,17 @@ public static EngineTimer getInstance() {
return instance;
}

public void Reset(){
public void Reset() {
previousTime = System.nanoTime();
currentTime = previousTime;
elapsedSeconds = 0;
}

public void SetMaxFps(int f){

maxfps = 1/(double)f;
public void SetMaxFps(int f) {
maxfps = 1 / (double) f;
}

public double GetElapsedSeconds(){
public double GetElapsedSeconds() {
return elapsedSeconds;
}
}
23 changes: 11 additions & 12 deletions src/EnginePrime/Entity.java
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
package EnginePrime;

import java.util.HashMap;
import java.util.Map;

public class Entity{
public class Entity {
public boolean isAlve = true;
public String name;
public String tag;
public Map<String, Component> ComponentPool = new HashMap<>();


public <T extends Component> T AddComponent(Class<T> type , int lifestep){
public <T extends Component> T AddComponent(Class<T> type, int lifestep) {
try {
T c= type.getDeclaredConstructor().newInstance();
T c = type.getDeclaredConstructor().newInstance();
c.Obj = this;
ComponentPool.put(c.getClass().getName(), c);

if(lifestep > 0){
if (lifestep > 0) {
c.Awake();
c.LifeStep = 1;
}
if(lifestep > 1){
if (lifestep > 1) {
c.Start();
c.LifeStep = 2;
}
Expand All @@ -30,9 +29,9 @@ public <T extends Component> T AddComponent(Class<T> type , int lifestep){
return null;
}

public <T extends Component> T AddComponent(Class<T> type){
public <T extends Component> T AddComponent(Class<T> type) {
try {
T c= type.getDeclaredConstructor().newInstance();
T c = type.getDeclaredConstructor().newInstance();
c.Obj = this;
c.LifeStep = 0;
ComponentPool.put(c.getClass().getName(), c);
Expand All @@ -42,12 +41,12 @@ public <T extends Component> T AddComponent(Class<T> type){
}
return null;
}
public <T extends Component> T GetComponent(Class<T> type){

public <T extends Component> T GetComponent(Class<T> type) {
Component c = ComponentPool.get(type.getName());
return type.cast(c);
}

public <T extends Component> T RemoveComponent(Class<T> type) {
T c = GetComponent(type);
c.Obj = null;
Expand Down
Loading

0 comments on commit 0eb9719

Please sign in to comment.