DarthAffe/ShootingStars
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

workarounded indicator, fixed minor problems

Browse Source
This commit is contained in:
Raybz@Raybz 2013-06-28 11:39:11 +02:00
parent 72bc89ccb1
commit 92344328be
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ShootingStars/assets/Textures/heat_ind.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 785 B

BIN
ShootingStars/assets/Textures/heat_ind_color.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

2
ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
View File

@ -60,7 +60,7 @@ public class ShootingStars extends SimpleApplication {
public ShootingStars(OptionSettings optionSettings) { public ShootingStars(OptionSettings optionSettings) {
super(new StatsAppState(), new DebugKeysAppState()); super(new StatsAppState(), new DebugKeysAppState());
this.optionSettings = optionSettings; this.optionSettings = optionSettings;
//Logger.getLogger("").setLevel(Level.SEVERE); Logger.getLogger("").setLevel(Level.SEVERE);
System.setProperty("jna.library.path", "lib/vlc"); System.setProperty("jna.library.path", "lib/vlc");
} }

20
ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
View File

@ -22,12 +22,12 @@ import com.jme3.input.event.MouseButtonEvent;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
import com.jme3.math.Vector2f; import com.jme3.math.Vector2f;
import com.jme3.scene.Spatial; import com.jme3.scene.Spatial;
import com.jme3.ui.Picture;
import org.wyrez.shootingstars.gui.controls.ButtonBase; import org.wyrez.shootingstars.gui.controls.ButtonBase;
import org.wyrez.shootingstars.gui.controls.GuiPlayerPointsControl; import org.wyrez.shootingstars.gui.controls.GuiPlayerPointsControl;
import org.wyrez.shootingstars.gui.listener.GameListener; import org.wyrez.shootingstars.gui.listener.GameListener;
import org.wyrez.shootingstars.helper.ScreenHelper; import org.wyrez.shootingstars.helper.ScreenHelper;
import tonegod.gui.controls.buttons.Button; import tonegod.gui.controls.buttons.Button;
import tonegod.gui.controls.extras.Indicator;
import tonegod.gui.controls.lists.Dial; import tonegod.gui.controls.lists.Dial;
import tonegod.gui.controls.text.Label; import tonegod.gui.controls.text.Label;
import tonegod.gui.controls.windows.Panel; import tonegod.gui.controls.windows.Panel;
@ -43,7 +43,7 @@ public class GameGUI extends Panel {
private Button btnStart; private Button btnStart;
private Button btnResume; private Button btnResume;
private Button btnMenu; private Button btnMenu;
private Dial indOverheat; private Indicator indOverheat;
private AssetManager assetManager; private AssetManager assetManager;
private Spatial player; private Spatial player;
private Label lblPoints; private Label lblPoints;
@ -104,17 +104,17 @@ public class GameGUI extends Panel {
btnMenu.setTextAlign(BitmapFont.Align.Center); btnMenu.setTextAlign(BitmapFont.Align.Center);
btnMenu.setFontSize(labelFontSize); btnMenu.setFontSize(labelFontSize);
indOverheat = new Dial(screen, new Vector2f(0f, 0f)) { indOverheat = new Indicator(screen, new Vector2f(0f, 0f), Indicator.Orientation.VERTICAL) {
@Override @Override
public void onChange(int arg0, Object arg1) { public void onChange(float arg0, float arg1) {
} }
}; };
indOverheat.setGapStartAngle(60); indOverheat.setDimensions(screenHelper.calcX(75f), screenHelper.calcY(75f));
indOverheat.setGapEndAngle(296);
indOverheat.setDimensions(screenHelper.calcX(50f), screenHelper.calcY(50f));
indOverheat.centerToParent(); indOverheat.centerToParent();
indOverheat.setDialImageBackground("Textures/crosshair.png"); indOverheat.setBaseImage("Textures/crosshair.png");
indOverheat.setDialImageIndicator("Textures/heat_ind.png"); indOverheat.setIndicatorImage("Textures/heat_ind_color.png");
indOverheat.setOverlayImage("Textures/empty.png");
indOverheat.setMaxValue(100f);
updateOverhead(0f); updateOverhead(0f);
lblPoints = new Label(screen, new Vector2f(startPointPointsx, startPointPointsy), new Vector2f(screenHelper.calcX(275f), screenHelper.calcY(180f))); lblPoints = new Label(screen, new Vector2f(startPointPointsx, startPointPointsy), new Vector2f(screenHelper.calcX(275f), screenHelper.calcY(180f)));
@ -174,7 +174,7 @@ public class GameGUI extends Panel {
} }
public void updateOverhead(float percent) { public void updateOverhead(float percent) {
indOverheat.setSelectedIndex(100*percent); indOverheat.setCurrentValue(100 * percent);
} }
public void setPoints(String points) { public void setPoints(String points) {

2
ShootingStars/src/org/wyrez/shootingstars/states/GameState.java
View File

@ -115,6 +115,7 @@ public class GameState extends AbstractAppState implements GameListener, ActionL
} }
public void initMediaPlayer() throws Exception { public void initMediaPlayer() throws Exception {
System.out.println("create");
mediaPlayer = mediaPlayerFactory.newDirectMediaPlayer(settings.getVideoFormat(), mediaPlayer = mediaPlayerFactory.newDirectMediaPlayer(settings.getVideoFormat(),
settings.getVideoWidth(), settings.getVideoHeight(), settings.getVideoWidth(), settings.getVideoHeight(),
settings.getVideoWidth() * settings.getVideoDepth(), cinema); settings.getVideoWidth() * settings.getVideoDepth(), cinema);
@ -244,6 +245,7 @@ public class GameState extends AbstractAppState implements GameListener, ActionL
} }
public void finished() { public void finished() {
isFinished = false;
highscoreManager.addScore(settings, optionSettings, Integer.valueOf(player.getUserData(UserDataKeys.POINTS).toString())); highscoreManager.addScore(settings, optionSettings, Integer.valueOf(player.getUserData(UserDataKeys.POINTS).toString()));
stateManager.setState(State.HIGHSCORE); stateManager.setState(State.HIGHSCORE);
} }

4
ShootingStars/src/org/wyrez/shootingstars/states/util/OptionSettings.java
View File

@ -59,9 +59,9 @@ public class OptionSettings {
settings.setTitle("Shooting Stars"); settings.setTitle("Shooting Stars");
settings.setSettingsDialogImage(""); settings.setSettingsDialogImage("");
setMasterVolume(100); setMasterVolume(100);
setMenuVolume(100); setMenuVolume(50);
setSoundVolume(100); setSoundVolume(100);
setUsername("Player"); setUsername("Nagareboshi");
setPostProcessing(true); setPostProcessing(true);
setParticleDensity(3); setParticleDensity(3);
setDepthBits(24); setDepthBits(24);