Skip to content

Commit 0377a32

Browse files
spynetSspynetS
committed
update
1 parent 8308f52 commit 0377a32

14 files changed

Lines changed: 125 additions & 58 deletions

File tree

‎out/production/JavaGameEngine/spel2/sound/jump.wav‎

329 KB
Binary file not shown.

‎res/spel2/sound/jump.wav‎

-218 KB
Binary file not shown.

‎src/com/javagamemaker/javagameengine/JavaGameEngine.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class JavaGameEngine{
1515

1616
public static JavaGameEngine gameInstance;
1717
private static boolean newScene = false;
18+
public static float masterVolume = 1f;
1819
public static int DELAY = 5;
1920
/**this is the JPanel that is rendering our scenes and retrieving inputs*/
2021
public static final GameWorld gameWorld = new GameWorld();
@@ -115,6 +116,7 @@ private static void update() {
115116
}
116117

117118
selectedScene.update();
119+
gameWindow.validate();
118120
gameWindow.repaint();
119121

120122
//For linux

‎src/com/javagamemaker/javagameengine/Scene.java‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public Scene() {
4141
public void instantiate(Component component) {
4242
component.start();
4343
newComponents.add(component);
44+
validate();
4445
}
4546

4647
public void startScene() {
@@ -139,6 +140,14 @@ public void setCamera(Camera camera) {
139140
* Updates all the components and calculates delta time and fps
140141
*/
141142
public void update() {
143+
if (newComponents.size() > 0) {
144+
components.addAll(newComponents);
145+
newComponents.clear();
146+
}
147+
if (remove.size() > 0) {
148+
components.removeAll(remove);
149+
remove.clear();
150+
}
142151
time += JavaGameEngine.deltaTime;
143152
if ((int) time / 100 > lastSec) {
144153
lastSec = (int) (time / 100);
@@ -161,14 +170,6 @@ public void update() {
161170

162171
camera.update();
163172

164-
if (newComponents.size() > 0) {
165-
components.addAll(newComponents);
166-
newComponents.clear();
167-
}
168-
if (remove.size() > 0) {
169-
components.removeAll(remove);
170-
remove.clear();
171-
}
172173
Input.setMousePressed(1000);
173174
}
174175

@@ -184,12 +185,14 @@ public void destroy(Component c) {
184185
public boolean inside(Component component) {
185186
return screen.contains(component.getShape().getBounds());
186187
}
187-
188+
public static void playSound(String path){
189+
playSound(path,JavaGameEngine.masterVolume);
190+
}
188191
/**
189192
* Plays a sound from path
190193
* @param path path
191194
*/
192-
public static void playSound(String path) {
195+
public static void playSound(String path, float volume) {
193196
new Thread(new Runnable() {
194197
@Override
195198
public void run() {
@@ -217,9 +220,14 @@ public synchronized void waitUntilDone() throws InterruptedException {
217220
AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(JavaGameEngine.class.getResourceAsStream(path));
218221
try {
219222
Clip clip = AudioSystem.getClip();
223+
if (volume < 0f || volume > 1f) throw new IllegalArgumentException("Volume not valid: " + volume);
224+
225+
220226
clip.addLineListener(listener);
221227
clip.open(audioInputStream);
222228
try {
229+
FloatControl gainControl = (FloatControl) clip.getControl(FloatControl.Type.MASTER_GAIN);
230+
gainControl.setValue(20f * (float) Math.log10(volume));
223231
clip.start();
224232
listener.waitUntilDone();
225233
} finally {
@@ -270,28 +278,27 @@ public int compare(Component o1, Component o2){
270278
}
271279
});
272280

273-
274281
try{
275282
int lsize = components.size();
276283
for(int i = 0; i < lsize;i++){
277284
Component c = renderList.get(i);
278285
if(inside(c)) {
279286
(c).render(graphics2D);
280-
if(!c.isVisible()){
281-
c.setVisible(true);
282-
c.onCameraEnter();
283-
}
284-
}
285-
else if(c.isVisible()){
286-
c.setVisible(false);
287-
c.onCameraLeft();
287+
//if(!c.isVisible()){
288+
// c.setVisible(true);
289+
// c.onCameraEnter();
290+
//}
288291
}
292+
//else if(c.isVisible()){
293+
// c.setVisible(false);
294+
// c.onCameraLeft();
295+
//}
289296
}
290-
//graphics2D.translate(width*percentW,height*percentH);
291-
graphics2D.translate(-camera.getPosition().getX(),-camera.getPosition().getY());
292-
//graphics2D.scale(1/scale.getX(),1/scale.getY());
297+
//graphics2D.translate(width*percentW,height*percentH);
298+
//graphics2D.scale(1/scale.getX(),1/scale.getY());
293299

294-
LightManager.render(graphics2D);
300+
graphics2D.translate(-camera.getPosition().getX(),-camera.getPosition().getY());
301+
LightManager.render(graphics2D);
295302

296303
}catch (Exception e){}
297304
}

‎src/com/javagamemaker/javagameengine/components/Component.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ public void setScale(Vector2 scale) {
167167
Vector2 newV = vertex.multiply(d);
168168
newVertices1.add(newV);
169169
}
170-
Debug.log(scale);
171170
c.setParentOffset(c.getParentOffset().multiply(d));
172171
setPosition(getPosition());
173172
c.localVertices = newVertices1;
@@ -217,12 +216,12 @@ public void translate(Vector2 towards){
217216
Collider otherCollider = (Collider) cc;
218217
if((addedX.collision(otherCollider)) != null ){
219218
if(collider.isTrigger()){
220-
CollisionEvent event = new CollisionEvent(collider,otherCollider,null);
221-
onTriggerEnter(event);
219+
onTriggerEnter(new CollisionEvent(collider,otherCollider,null));
220+
otherCollider.onTriggerEnter(new CollisionEvent(otherCollider,collider,null));
222221
}
223222
else if(otherCollider.isTrigger()){
224-
CollisionEvent event = new CollisionEvent(otherCollider,collider,null);
225-
otherCollider.onTriggerEnter(event);
223+
onTriggerEnter(new CollisionEvent(otherCollider,collider,null));
224+
otherCollider.onTriggerEnter(new CollisionEvent(otherCollider,collider,null));
226225
}
227226
else{
228227
newPos.setX(0);
@@ -242,9 +241,13 @@ else if(otherCollider.isTrigger()){
242241
}
243242
}
244243
if((addedY.collision(otherCollider)) !=null ){
245-
if(collider.isTrigger() || otherCollider.isTrigger()){
246-
CollisionEvent event = new CollisionEvent(collider,otherCollider,null);
247-
onTriggerEnter(event);
244+
if(collider.isTrigger()){
245+
onTriggerEnter(new CollisionEvent(collider,otherCollider,null));
246+
otherCollider.onTriggerEnter(new CollisionEvent(otherCollider,collider,null));
247+
}
248+
else if(otherCollider.isTrigger()){
249+
onTriggerEnter(new CollisionEvent(collider,otherCollider,null));
250+
otherCollider.onTriggerEnter(new CollisionEvent(otherCollider,collider,null));
248251
}
249252
else{
250253
newPos.setY(0);

‎src/com/javagamemaker/javagameengine/components/Sprite.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ public Vector2 getScale() {
148148

149149
@Override
150150
public void setScale(Vector2 scale) {
151+
super.setScale(scale);
151152
this.scale = scale;
152153
}
153154

‎src/com/javagamemaker/javagameengine/components/lights/Light.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.javagamemaker.javagameengine.components.Component;
55
import com.javagamemaker.javagameengine.components.shapes.Circle;
66
import com.javagamemaker.javagameengine.components.shapes.Rect;
7+
import com.javagamemaker.javagameengine.msc.Debug;
78
import com.javagamemaker.javagameengine.msc.Vector2;
89

910
import java.awt.*;
@@ -31,7 +32,6 @@ public void start() {
3132
@Override
3233
public void render(Graphics2D g) {
3334
super.render(g);
34-
3535
//g.fill(getShape());
3636

3737
LinkedList<Vector2> ver = new LinkedList<>();

‎src/com/javagamemaker/testing/spel2/Bullet.java‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,31 @@
1-
package com.javagamemaker.testing.spel2;public class Bullet {
1+
package com.javagamemaker.testing.spel2;
2+
3+
import com.javagamemaker.javagameengine.components.Collider;
4+
import com.javagamemaker.javagameengine.components.PhysicsBody;
5+
import com.javagamemaker.javagameengine.components.Sprite;
6+
import com.javagamemaker.javagameengine.msc.Debug;
7+
import com.javagamemaker.javagameengine.msc.Vector2;
8+
9+
public class Bullet extends Sprite {
10+
11+
public Bullet(Vector2 startPos, Vector2 dir){
12+
loadAnimation(new String[]{"/spel2/sprites/cookie.png"});
13+
PhysicsBody p = new PhysicsBody();
14+
p.velocity = dir.multiply(10);
15+
p.setFriction(0.01f);
16+
add(p);
17+
Collider c = new Collider(true);
18+
c.setTrigger(true);
19+
add(c);
20+
setPosition(startPos);
21+
setScale(new Vector2(20,20));
22+
}
23+
int t = 0;
24+
25+
@Override
26+
public void updateSecond() {
27+
super.updateSecond();
28+
if(t>=3) destroy();
29+
t++;
30+
}
231
}

‎src/com/javagamemaker/testing/spel2/Coin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ public Coin(Vector2 pos){
2020
points.add(new AnimationPoint(new Vector2(0,-1),50));
2121
animation.setSelectedPoints(points);
2222

23-
setScale(new Vector2(50,50));
24-
Collider c = new Collider(false);
23+
Collider c = new Collider(true);
2524
c.setTrigger(true);
2625
add(c);
27-
c.setScale(new Vector2(50,50));
2826
c.updateVertices();
27+
setScale(new Vector2(50,50));
2928
}
3029

3130
@Override
@@ -34,7 +33,8 @@ protected void onTriggerEnter(CollisionEvent collisionEvent) {
3433
if(collisionEvent.getCollider2().getTag() == "player"){
3534
destroy();
3635
if(Main.player.physicsBody.velocity.getY() > -8)
37-
Main.player.physicsBody.addForce(Vector2.up.multiply(32));
36+
Main.player.physicsBody.addForce(Vector2.up.multiply(50));
37+
Main.player.coins ++;
3838
Main.getSelectedScene().playSound(("/spel2/sound/coin.wav"));
3939
}
4040

‎src/com/javagamemaker/testing/spel2/Enemy.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public void animationDone() {
5656
@Override
5757
protected void onTriggerEnter(CollisionEvent collisionEvent) {
5858
super.onTriggerEnter(collisionEvent);
59-
Debug.startCount();
6059
if(animationIndex == 0)
6160
Scene.playSound("/spel2/sound/watersplash.wav");
6261
animationIndex = 1;

0 commit comments

Comments
 (0)