ristipolku: game/Engine.java annotate

annotate game/Engine.java @ 179:ac5cf78a1cd2

Cosmetics.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 16 Mar 2017 10:47:09 +0200
parents	9d3ff9605555
children	fa9f29387cff

rev	line source
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	2 * Ristipolku Game Engine
151 d6d92845d6a2 ISO-8859-1 -> UTF-8. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	3 * (C) Copyright 2011 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 */
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	5 package game;
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	6
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 import java.awt.*;
f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 import java.awt.geom.*;
1 44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	9 import java.awt.event.*;
7 70714c229e23 More work. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	10 import java.awt.image.*;
70714c229e23 More work. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	11 import java.awt.event.*;
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	12 import java.awt.font.*;
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	13 import javax.imageio.*;
7 70714c229e23 More work. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	14 import javax.swing.*;
1 44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	15 import java.util.*;
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	16 import java.util.concurrent.locks.Lock;
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	17 import java.util.concurrent.locks.ReentrantReadWriteLock;
6 be0bf7544069 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	18 import java.io.*;
1 44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	19 import game.*;
37 3dc5ae9f1c80 Work on game logic. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	20 import javax.sound.sampled.*;
21 df494a65bf8c More work. Matti Hamalainen <ccr@tnsp.org> parents: 18 diff changeset	21
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	22
176 9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	23 class AboutBox extends IDMContainer
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	24 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	25 BufferedImage aboutImg;
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	26
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	27 public AboutBox()
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	28 {
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	29 setPos(150f, 150f);
176 9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	30 setSize(720f, 470f);
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	31 setModal(true);
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	32
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	33 add(new BtnOK(500f, 390f));
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	34 }
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	35
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	36 public void paint(Graphics2D g)
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	37 {
115 8c3bc197310d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	38 g.setPaint(new Color(0.0f, 0.0f, 0.0f, 0.7f));
170 b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	39 g.fill(new RoundRectangle2D.Float(getScaledX(), getScaledY(), getScaledWidth(), getScaledHeight(), 10, 10));
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	40
76 43f68fe605de More cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	41 setTextFont(G.fonts[3], G.metrics[3]);
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	42 setTextPaint(Color.white);
173 8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	43 setCurrPosScaledRel(20, 35);
105 75015dfd47ef Move version number info to G.java. Matti Hamalainen <ccr@tnsp.org> parents: 93 diff changeset	44 drawString(g, "RistiPolku (CrossPaths) v"+ G.version +"\n");
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	45
76 43f68fe605de More cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	46 setTextFont(G.fonts[1], G.metrics[1]);
173 8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	47 setTextPaint(Color.yellow);
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	48 drawString(g, "(c) Copyright 2011 Tecnic Software productions (TNSP)\n");
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	49
173 8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	50 setTextPaint(Color.white);
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	51 drawString(g, "Programming, graphics and design by " +
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	52 "Matti 'ccr' Hämäläinen.\n" +
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	53 "Audio from archive.org, used non-commercially.\n \n");
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	54
173 8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	55 setTextPaint(Color.red);
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	56 drawString(g, "Controls:\n");
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	57
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	58 IDMPoint old = textCurrOffs.copy();
81 8932b1300ba1 Adjust about box size, add instructions. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	59
173 8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	60 setTextPaint(Color.white);
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	61 drawString(g,
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	62 "Arrow keys / mouse wheel\n"+
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	63 "Enter / mouse click\n"+
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	64 "Space bar\n");
81 8932b1300ba1 Adjust about box size, add instructions. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	65
173 8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	66 textCurrPos.x += getScaledX(330);
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	67 textCurrOffs.y = old.y;
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	68 drawString(g,
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	69 "- Rotate piece\n" +
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	70 "- Place/lock piece\n" +
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	71 "- Swap piece\n");
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	72
173 8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	73 textCurrPos.x -= getScaledX(330);
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	74 setTextPaint(Color.green);
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	75 drawString(g,
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	76 "\nObjective: Create a path long as possible by rotating\n"+
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	77 "and placing pieces. More points will be awarded for\n"+
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	78 "advancing the path by several segments per turn."
8995a0363e0a Remove secret. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	79 );
179 ac5cf78a1cd2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	80
176 9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	81 super.paint(g);
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	82 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	83
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	84 public void clicked()
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	85 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	86 parent.remove(this);
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	87 }
176 9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	88
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	89 class BtnOK extends IDMButton
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	90 {
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	91 public BtnOK(float x, float y)
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	92 {
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	93 super(x, y, KeyEvent.VK_ESCAPE, G.fonts[1], "OK");
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	94 }
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	95
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	96 public void clicked()
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	97 {
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	98 parent.clicked();
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	99 }
9d3ff9605555 Change AboutBox to a "dialog" and implement Ok/close button for closing it. Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	100 }
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	101 }
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	102
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	104 class GameBoard extends IDMWidget
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	106 static final int boardSize = 9;
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	107 static final int boardMiddle = 4;
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	108 Piece[][] board;
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	109 float pscale, ptime;
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	110
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	111 public boolean flagGameOver, flagBoardIsDirty;
119 52d79502447c Make few variables un-public. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	112 int gameScore;
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	113
119 52d79502447c Make few variables un-public. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	114 Piece currPiece, nextPiece;
41 a5fd4f74a767 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	115 int currX, currY, currPoint;
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	116
47 695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	117 Sound sndPlaced;
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	118
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	119 private final ReentrantReadWriteLock pointLock = new ReentrantReadWriteLock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	120 private ArrayList<AnimatedPointElement> pointElems;
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	121
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	122 public GameBoard(IDMPoint pos, float ps)
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	123 {
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	124 super(pos);
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	125 pscale = ps;
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	126
108 ae66d21d4747 Disable piece placement sound. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	127 // sndPlaced = G.smgr.getSound("sounds/placed.wav");
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	128
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	129 pointElems = new ArrayList<AnimatedPointElement>();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	130
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	131 startNewGame();
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	132 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	133
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	134 public void startNewGame()
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	135 {
1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	136 board = new Piece[boardSize][boardSize];
1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	137 board[boardMiddle][boardMiddle] = new Piece(PieceType.START);
1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	138
41 a5fd4f74a767 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	139 currX = boardMiddle;
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	140 currY = boardMiddle;
951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	141 currPoint = 0;
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	142
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	143 currPiece = null;
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	144 nextPiece = new Piece(PieceType.ACTIVE);
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	145
65 dc936dba124e Set game over-flag correctly, so that we reset everything after a game over Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	146 flagGameOver = false;
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	147 flagBoardIsDirty = true;
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	148 pieceFinishTurn();
55 974ec36c562e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	149 gameScore = 0;
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	150 }
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	152 public void paintBackPlate(Graphics2D g)
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	153 {
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	154 g.setPaint(new Color(0.0f, 0.0f, 0.0f, 0.2f));
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	155 g.setStroke(new BasicStroke(5.0f));
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	156 g.draw(new RoundRectangle2D.Float(getScaledX(), getScaledY(),
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	157 boardSize * pscale, boardSize * pscale,
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	158 pscale / 5, pscale / 5));
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	159 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	160
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	161 public void paintBoard(Graphics2D g, boolean drawCurrent)
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	162 {
1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	163 for (int y = 0; y < boardSize; y++)
1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	164 for (int x = 0; x < boardSize; x++)
1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	165 if (board[x][y] != null)
1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	166 {
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	167 if ((drawCurrent && board[x][y] == currPiece) \|\|
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	168 (!drawCurrent && board[x][y] != currPiece))
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	169 {
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	170 board[x][y].paint(g,
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	171 getScaledX() + (x * pscale),
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	172 getScaledY() + (y * pscale),
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	173 pscale - pscale / 10);
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	174 }
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	175 }
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	176 }
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	177
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	178 public void paint(Graphics2D g)
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	179 {
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	180 paintBoard(g, true);
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	181
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	182 Lock read = pointLock.readLock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	183 read.lock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	184 try
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	185 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	186 for (AnimatedPointElement elem : pointElems)
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	187 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	188 elem.paint(g);
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	189 }
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	190 }
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	191 finally
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	192 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	193 read.unlock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	194 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	195
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	196
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	197 if (!flagGameOver)
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	198 {
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	199 if (nextPiece != null)
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	200 {
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	201 // Draw next piece
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	202 AffineTransform save = g.getTransform();
154 48b91eabc029 Improve scaling a bit, not completely functional yet. Matti Hamalainen <ccr@tnsp.org> parents: 152 diff changeset	203 nextPiece.paint(g, G.screenDim.width * 0.85f - 90.0f/2.0f, G.screenDim.height * 0.43f, 90.0f);
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	204 g.setTransform(save);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	205 }
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	206 }
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	207 else
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	208 {
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	209 // Game over text
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	210 String text = "Game Over!";
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	211 int textWidth = G.metrics[2].stringWidth(text);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	212 g.setFont(G.fonts[2]);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	213
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	214 g.setPaint(new Color(0.0f, 0.0f, 0.0f, 0.5f));
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	215 g.drawString(text, (G.screenDim.width - textWidth) / 2 + 5, G.screenDim.height / 2 + 5);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	216
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	217 double f = Math.sin(ptime * 0.1) * 4.0;
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	218 g.setPaint(Color.white);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	219 g.drawString(text, (G.screenDim.width - textWidth) / 2 + (float) f, G.screenDim.height / 2 + (float) f);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	220 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	221
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	222 // Score
154 48b91eabc029 Improve scaling a bit, not completely functional yet. Matti Hamalainen <ccr@tnsp.org> parents: 152 diff changeset	223 String text = ""+ String.format("%05d", gameScore);
48b91eabc029 Improve scaling a bit, not completely functional yet. Matti Hamalainen <ccr@tnsp.org> parents: 152 diff changeset	224 int textWidth = G.metrics[2].stringWidth(text);
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	225 g.setFont(G.fonts[2]);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	226 g.setPaint(Color.white);
154 48b91eabc029 Improve scaling a bit, not completely functional yet. Matti Hamalainen <ccr@tnsp.org> parents: 152 diff changeset	227 g.drawString(text, (G.screenDim.width * 0.85f) - textWidth / 2, G.screenDim.height * 0.3f);
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	228 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	229
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	230 public boolean contains(float x, float y)
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	231 {
76 43f68fe605de More cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	232 return (x >= getScaledX() &&
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	233 y >= getScaledY() &&
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	234 x < getScaledX() + boardSize * pscale &&
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	235 y < getScaledY() + boardSize * pscale);
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	236 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	237
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	238 public boolean isBoardDirty()
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	239 {
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	240 if (flagBoardIsDirty)
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	241 {
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	242 flagBoardIsDirty = false;
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	243 return true;
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	244 }
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	245 else
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	246 return false;
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	247 }
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	248
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	249 public void animate(float time)
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	250 {
148 5b25561855c3 Move next piece animation call into better place. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	251 if (nextPiece != null)
5b25561855c3 Move next piece animation call into better place. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	252 {
5b25561855c3 Move next piece animation call into better place. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	253 nextPiece.animate(time);
5b25561855c3 Move next piece animation call into better place. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	254 }
179 ac5cf78a1cd2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	255
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	256 ptime = time;
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	257 for (int y = 0; y < boardSize; y++)
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	258 for (int x = 0; x < boardSize; x++)
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	259 if (board[x][y] != null)
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	260 {
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	261 board[x][y].animate(time);
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	262 if (board[x][y] != currPiece && board[x][y].active)
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	263 flagBoardIsDirty = true;
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	264 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	265
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	266 Lock write = pointLock.writeLock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	267 write.lock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	268 try
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	269 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	270 ArrayList<AnimatedPointElement> tmp = new ArrayList<AnimatedPointElement>();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	271
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	272 for (AnimatedPointElement elem : pointElems)
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	273 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	274 elem.animate(time);
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	275 if (elem.active)
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	276 tmp.add(elem);
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	277 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	278
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	279 pointElems = tmp;
144 f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	280
f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	281 if (time % 32 == 1)
f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	282 {
f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	283 Random rnd = new Random();
f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	284 pointElems.add(new AnimatedPointElement(
f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	285 new IDMPoint(10 + rnd.nextInt(400), 10 + rnd.nextInt(100)), "."));
f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	286 }
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	287 }
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	288 finally
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	289 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	290 write.unlock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	291 }
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	292 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	293
32 e480579cc460 More work on debugging the path resolving. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	294 public void pieceRotate(Piece.RotateDir dir)
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	295 {
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	296 if (currPiece != null && !flagGameOver)
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	297 {
41 a5fd4f74a767 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 40 diff changeset	298 currPiece.rotate(dir);
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	299 }
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	300 }
1 44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	301
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	302 // Change coordinates based on the "outgoing"
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	303 // piece connection point.
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	304 private void pieceMoveTo(int point)
7 70714c229e23 More work. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	305 {
46 3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	306 switch (point)
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	307 {
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	308 case 0: currY--; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	309 case 1: currY--; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	310
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	311 case 2: currX++; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	312 case 3: currX++; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	313
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	314 case 4: currY++; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	315 case 5: currY++; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	316
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	317 case 6: currX--; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	318 case 7: currX--; break;
3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	319 }
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	320 }
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	321
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	322 public void pieceCreateNew()
cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	323 {
cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	324 currPiece = nextPiece;
106 41c6cca69d60 Make new pieces appear gradually, and same effect for swapping. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	325 currPiece.changed();
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	326 nextPiece = new Piece(PieceType.ACTIVE);
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	327 flagBoardIsDirty = true;
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	328 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	329
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	330 public void pieceSwapCurrent()
cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	331 {
56 8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	332 if (!flagGameOver)
8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	333 {
8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	334 Piece tmp = currPiece;
8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	335 currPiece = nextPiece;
8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	336 nextPiece = tmp;
8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	337 board[currX][currY] = currPiece;
106 41c6cca69d60 Make new pieces appear gradually, and same effect for swapping. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	338 currPiece.changed();
41c6cca69d60 Make new pieces appear gradually, and same effect for swapping. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	339 nextPiece.changed();
139 be9cc2ee3c16 Minor fixes in updating logic. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	340 flagBoardIsDirty = true;
56 8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	341 }
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	342 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	343
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	344 // Check one piece, set connections, find the new placement
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	345 // based on piece rotations etc.
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	346 private boolean pieceCheck(Piece piece)
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	347 {
53 6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	348 if (piece == null)
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	349 {
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	350 // Create new piece
56 8718cc1c6586 Minor bugfixes. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	351 pieceCreateNew();
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	352 board[currX][currY] = currPiece;
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	353 return true;
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	354 }
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	355 else
53 6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	356 if (piece.getType() == PieceType.START)
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	357 {
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	358 if (currPiece != null)
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	359 {
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	360 // Hit center starting piece, game over
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	361 flagGameOver = true;
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	362 return true;
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	363 }
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	364 else
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	365 {
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	366 // Start piece as first piece means game is starting
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	367 pieceMoveTo(currPoint);
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	368 pieceCreateNew();
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	369 board[currX][currY] = currPiece;
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	370 return true;
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	371 }
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	372 }
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	373
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	374 // Mark the current piece as locked
53 6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	375 piece.setType(PieceType.LOCKED);
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	376
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	377 // Solve connection (with rotations) through the piece
53 6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	378 currPoint = piece.getRotatedPoint(piece.getMatchingPoint(currPoint));
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	379
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	380 // Mark connection as active
53 6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	381 piece.setConnectionState(currPoint, true);
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	382
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	383 // Solve exit point (with rotations)
53 6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	384 currPoint = piece.getAntiRotatedPoint(piece.getConnection(currPoint));
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	385
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	386 // Move to next position accordingly
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	387 pieceMoveTo(currPoint);
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	388 return false;
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	389 }
f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	390
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	391 // Finish one move/turn of the game, resolve path and find placement
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	392 // of the next piece, or set "game over" state if required.
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	393 public void pieceFinishTurn()
951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	394 {
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	395 boolean finished = false;
55 974ec36c562e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	396 int connections = 0;
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	397
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	398 if (currPiece != null)
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	399 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	400 G.smgr.play(sndPlaced);
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	401 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	402
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	403 while (!finished)
7 70714c229e23 More work. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	404 {
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	405 if (currX >= 0 && currX < boardSize && currY >= 0 && currY < boardSize)
27 26adc2827983 More work on the internals. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	406 {
135 a33fdb1de11c Fix where the animated point elements appear initially. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	407 int oldX = currX, oldY = currY;
55 974ec36c562e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	408 connections++;
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	409 finished = pieceCheck(board[currX][currY]);
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	410
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	411 if (!finished)
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	412 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	413 Lock write = pointLock.writeLock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	414 write.lock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	415 try
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	416 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	417 pointElems.add(new AnimatedPointElement(
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	418 new IDMPoint(
135 a33fdb1de11c Fix where the animated point elements appear initially. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	419 getScaledX() + ((oldX + 0.5f) * pscale),
a33fdb1de11c Fix where the animated point elements appear initially. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	420 getScaledY() + ((oldY + 0.5f) * pscale)),
131 67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	421 "" + connections));
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	422 }
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	423 finally
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	424 {
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	425 write.unlock();
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	426 }
67b2322fda91 Add spawning of animated score elements when player finishes a turn. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	427 }
135 a33fdb1de11c Fix where the animated point elements appear initially. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	428
27 26adc2827983 More work on the internals. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	429 }
26adc2827983 More work on the internals. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	430 else
26adc2827983 More work on the internals. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	431 {
46 3e8d1c30f573 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	432 // Outside of the board, game over
48 f13bab4cccd3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 47 diff changeset	433 finished = true;
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	434 flagGameOver = true;
7 70714c229e23 More work. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	435 }
70714c229e23 More work. Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	436 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	437
66 d406e14b870d Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	438 // Compute and add score
55 974ec36c562e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	439 gameScore += connections * connections;
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	440
66 d406e14b870d Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	441 // If game over, clear the game
53 6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	442 if (flagGameOver)
6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	443 {
6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	444 currPiece = null;
6bf4675e2d96 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	445 }
139 be9cc2ee3c16 Minor fixes in updating logic. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	446
be9cc2ee3c16 Minor fixes in updating logic. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	447 flagBoardIsDirty = true;
42 951a4d669af0 Initially working path solving algorithm. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	448 }
66 d406e14b870d Add comments. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	449
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	450 public boolean mouseWheelMoved(MouseWheelEvent e)
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	451 {
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	452 int notches = e.getWheelRotation();
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	453
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	454 if (notches < 0)
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	455 pieceRotate(Piece.RotateDir.LEFT);
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	456 else
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	457 pieceRotate(Piece.RotateDir.RIGHT);
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	458
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	459 return true;
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	460 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	461
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	462 public void clicked()
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	463 {
77 d17db72ac770 Fix the game continuing after gameover bug again due to refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	464 if (!flagGameOver)
d17db72ac770 Fix the game continuing after gameover bug again due to refactoring. Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	465 pieceFinishTurn();
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	466 }
47 695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	467
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	468 public boolean keyPressed(KeyEvent e)
47 695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	469 {
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	470 if (flagGameOver)
cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	471 return false;
cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	472
47 695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	473 switch (e.getKeyCode())
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	474 {
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	475 case KeyEvent.VK_LEFT:
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	476 case KeyEvent.VK_UP:
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	477 pieceRotate(Piece.RotateDir.LEFT);
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	478 return true;
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	479
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	480 case KeyEvent.VK_RIGHT:
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	481 case KeyEvent.VK_DOWN:
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	482 pieceRotate(Piece.RotateDir.RIGHT);
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	483 return true;
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	484
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	485 case KeyEvent.VK_ENTER:
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	486 pieceFinishTurn();
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	487 return true;
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	488 }
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	489 return false;
695cf13c103a Move some code. Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	490 }
1 44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	491 }
44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	492
44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	493
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	494 public class Engine extends JPanel
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	495 implements Runnable, KeyListener,
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	496 MouseListener, MouseWheelListener
1 44f1e7b47fcf Preliminary work ... puuh. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	497 {
164 2b2fa62cfea5 Fix animation timing. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	498 double startTime;
144 f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	499 float gameUpdates, gameFrames;
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	500
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	501 Thread animThread;
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	502 boolean animEnable = false;
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	503
4 e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	504 GameBoard lauta = null;
69 163232ec225b Stream music data instead of loading to memory. Matti Hamalainen <ccr@tnsp.org> parents: 68 diff changeset	505 InputStream musa;
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	506 IDMContainer widgets;
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	507 AboutBox aboutBox;
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	508
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	509 public void dbg(String msg)
0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	510 {
0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	511 System.out.print("Engine: " + msg);
0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	512 }
0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	513
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	514 public Engine()
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	515 {
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	516 // Initialize globals
bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	517 System.out.print("Engine() constructor\n");
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	518
37 3dc5ae9f1c80 Work on game logic. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	519 // Sound system
133 881deac2daf8 Some more work on scaling widgets, etc. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	520 G.smgr = new SoundManager(new AudioFormat(22050, 16, 1, true, false), 1);
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	521
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	522 // Load resources
4 e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	523 try
e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	524 {
24 1be98362e5e9 FPS measurement. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	525 ResourceLoader res = new ResourceLoader("graphics/board.jpg");
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	526 G.lautaBG = ImageIO.read(res.getStream());
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	527
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	528 try {
bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	529 res = new ResourceLoader("graphics/font.ttf");
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	530
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	531 G.fonts = new Font[G.numFonts];
170 b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	532 G.baseFont = Font.createFont(Font.TRUETYPE_FONT, res.getStream());
179 ac5cf78a1cd2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	533
170 b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	534 setupDerivedFonts(1.0f);
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	535 }
bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	536 catch (FontFormatException e)
bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	537 {
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	538 dbg("Could not initialize fonts.\n");
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	539 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	540
69 163232ec225b Stream music data instead of loading to memory. Matti Hamalainen <ccr@tnsp.org> parents: 68 diff changeset	541 res = new ResourceLoader("sounds/gamemusic.wav");
163232ec225b Stream music data instead of loading to memory. Matti Hamalainen <ccr@tnsp.org> parents: 68 diff changeset	542 musa = res.getStream();
4 e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	543 }
e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	544 catch (IOException e)
e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	545 {
e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	546 JOptionPane.showMessageDialog(null,
21 df494a65bf8c More work. Matti Hamalainen <ccr@tnsp.org> parents: 18 diff changeset	547 e.getMessage(),
4 e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	548 "Initialization error",
e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	549 JOptionPane.ERROR_MESSAGE);
37 3dc5ae9f1c80 Work on game logic. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	550
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	551 dbg(e.getMessage());
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	552 }
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	553
52 01851bae3da3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 51 diff changeset	554 // Create IDM GUI widgets
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	555 widgets = new IDMContainer();
52 01851bae3da3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 51 diff changeset	556
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	557 lauta = new GameBoard(new IDMPoint(95, 130), 63);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	558 widgets.add(lauta);
973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	559
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	560 widgets.add(new BtnSwapPiece(767f, 450f));
124 fa1b86b632aa Slight changes in UI buttons placement to match the graphics changes. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	561 widgets.add(new BtnAbout (767f, 550f));
fa1b86b632aa Slight changes in UI buttons placement to match the graphics changes. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	562 widgets.add(new BtnNewGame (767f, 630f));
50 496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	563
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	564 aboutBox = new AboutBox();
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	565
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	566 // Game
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	567 startNewGame();
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	568
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	569 // Initialize event listeners
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	570 addKeyListener(this);
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	571 addMouseListener(this);
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	572 addMouseWheelListener(this);
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	573
93 e1d657e6c25b Work on audio code. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	574 // Start playing background music
e1d657e6c25b Work on audio code. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	575 G.smgr.play(musa);
e1d657e6c25b Work on audio code. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	576
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	577 // Get initial focus
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	578 if (!hasFocus())
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	579 {
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	580 dbg("Requesting focus.\n");
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	581 requestFocus();
4 e0e8fd08331e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	582 }
93 e1d657e6c25b Work on audio code. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	583
144 f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	584 gameUpdates = 0;
164 2b2fa62cfea5 Fix animation timing. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	585 startTime = System.currentTimeMillis();
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	586 }
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	587
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	588 public void startNewGame()
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	589 {
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	590 gameFrames = 0;
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	591 lauta.startNewGame();
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	592 }
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	593
170 b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	594 public void setupDerivedFonts(float scale)
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	595 {
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	596 G.fonts[0] = G.baseFont.deriveFont(16f * scale);
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	597 G.fonts[1] = G.baseFont.deriveFont(22f * scale);
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	598 G.fonts[2] = G.baseFont.deriveFont(62f * scale);
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	599 G.fonts[3] = G.baseFont.deriveFont(32f * scale);
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	600 }
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	601
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	602 public void paintComponent(Graphics g)
bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	603 {
bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	604 Graphics2D g2 = (Graphics2D) g;
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	605 boolean scaleChanged = false,
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	606 updateBoard = lauta.isBoardDirty();
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	607
52 01851bae3da3 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 51 diff changeset	608 // Rescale if parent component size has changed
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	609 Dimension dim = getSize();
170 b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	610 if (G.screenDim == null \|\| !dim.equals(G.screenDim) \|\| G.metrics == null)
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	611 {
170 b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	612 dbg("Scale changed.\n");
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	613 scaleChanged = true;
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	614 updateBoard = true;
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	615
133 881deac2daf8 Some more work on scaling widgets, etc. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	616 float dw = dim.width / 1024.0f,
881deac2daf8 Some more work on scaling widgets, etc. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	617 dh = dim.height / 768.0f;
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	618
170 b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	619 G.screenDim = dim;
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	620
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	621 // Rescale fonts
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	622 setupDerivedFonts(dw);
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	623
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	624 // Get font metrics against current Graphics2D context
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	625 G.metrics = new FontMetrics[G.numFonts];
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	626 for (int i = 0; i < G.numFonts; i++)
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	627 G.metrics[i] = g2.getFontMetrics(G.fonts[i]);
b9bc493ae53c Modularize and clean up code. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	628
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	629 // Rescale IDM GUI widgets
133 881deac2daf8 Some more work on scaling widgets, etc. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	630 widgets.setScale(dw, dh);
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	631 }
179 ac5cf78a1cd2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	632
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	633 if (updateBoard)
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	634 {
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	635 // dbg("updateBoard()\n");
138 9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	636 G.lautaBGScaled = new BufferedImage(dim.width, dim.height, BufferedImage.TYPE_INT_RGB);
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	637 Graphics2D gimg = G.lautaBGScaled.createGraphics();
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	638 gimg.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	639 RenderingHints.VALUE_INTERPOLATION_BICUBIC);
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	640
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	641 gimg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	642 RenderingHints.VALUE_ANTIALIAS_ON);
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	643
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	644 gimg.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	645 RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	646
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	647 gimg.drawImage(G.lautaBG, 0, 0, dim.width, dim.height, null);
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	648 lauta.paintBackPlate(gimg);
9eb791e2fa17 Optimize board updating logic, so that the old placed tiles need not to be Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	649 lauta.paintBoard(gimg, false);
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	650 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	651
4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	652
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	653 // Draw background image, pieces, widgets
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	654 g2.drawImage(G.lautaBGScaled, 0, 0, null);
86 454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	655
454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	656 // Use antialiasing when rendering the game elements
454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	657 g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	658 RenderingHints.VALUE_ANTIALIAS_ON);
454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	659
454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	660 g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	661 RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
454a9fcd13ca Turn antialiasing rendering hints on only for the needed elements to improve rendering speed and CPU usage. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	662
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	663 widgets.paint(g2);
55 974ec36c562e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 54 diff changeset	664
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	665
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	666 // Frames per second counter
155 1ba6f56203f2 Disable FPS counter for now. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	667 /*
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	668 g2.setFont(G.fonts[1]);
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	669 long currTime = new Date().getTime();
117 973f567c7b9d Change how gameboard is rendered, make it more OO-sensible. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	670 g2.drawString("fps = "+ ((gameFrames * 1000) / (currTime - startTime)), G.screenDim.width - 120, 20);
155 1ba6f56203f2 Disable FPS counter for now. Matti Hamalainen <ccr@tnsp.org> parents: 154 diff changeset	671 */
168 159252f9480d Fix animation choppiness. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	672
159252f9480d Fix animation choppiness. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	673 Toolkit.getDefaultToolkit().sync();
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	674 gameFrames++;
25 bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	675 }
bbac3e4a4b9b Cleanups, etc. Matti Hamalainen <ccr@tnsp.org> parents: 24 diff changeset	676
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	677 public void startThreads()
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	678 {
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	679 dbg("startThreads()\n");
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	680 if (animThread == null)
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	681 {
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	682 animThread = new Thread(this);
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	683 animEnable = true;
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	684 animThread.start();
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	685 }
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	686 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	687
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	688 public void stopThreads()
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	689 {
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	690 dbg("stopThreads()\n");
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	691
37 3dc5ae9f1c80 Work on game logic. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	692 // Stop animations
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	693 if (animThread != null)
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	694 {
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	695 animThread.interrupt();
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	696 animEnable = false;
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	697 animThread = null;
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	698 }
22 afde253ec705 More work. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	699
37 3dc5ae9f1c80 Work on game logic. Matti Hamalainen <ccr@tnsp.org> parents: 35 diff changeset	700 // Shut down sound manager
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	701 G.smgr.close();
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	702 }
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	704 public void mouseEntered(MouseEvent e)
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	705 {
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	706 widgets.mouseEntered(e);
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	707 }
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	708 public void mouseExited(MouseEvent e)
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	709 {
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	710 widgets.mouseExited(e);
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	711 }
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	712
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	713 public void mousePressed(MouseEvent e)
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	714 {
175 55ea5821c802 Implement "real" widget modality. Matti Hamalainen <ccr@tnsp.org> parents: 173 diff changeset	715 widgets.mousePressed(e);
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	716 }
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	717
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	718 public void mouseReleased(MouseEvent e)
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	719 {
175 55ea5821c802 Implement "real" widget modality. Matti Hamalainen <ccr@tnsp.org> parents: 173 diff changeset	720 widgets.mouseReleased(e);
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	721 }
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	722
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	723 public void mouseClicked(MouseEvent e)
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	724 {
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	725 if (!hasFocus())
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	726 {
147 0ec311706d3c Clean up debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	727 dbg("Requesting focus.\n");
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	728 requestFocus();
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	729 }
59 fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	730 }
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	731
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	732 public void mouseWheelMoved(MouseWheelEvent e)
fd10a9422b60 Cleanups, bugfixes, etc etc. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	733 {
175 55ea5821c802 Implement "real" widget modality. Matti Hamalainen <ccr@tnsp.org> parents: 173 diff changeset	734 if (widgets.getActiveModalWidget() == null)
55ea5821c802 Implement "real" widget modality. Matti Hamalainen <ccr@tnsp.org> parents: 173 diff changeset	735 lauta.mouseWheelMoved(e);
18 4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	736 }
4507a431b410 More work. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	737
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	738 public void keyTyped(KeyEvent e) { }
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	739 public void keyReleased(KeyEvent e) { }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	740
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	741 public void keyPressed(KeyEvent e)
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	742 {
175 55ea5821c802 Implement "real" widget modality. Matti Hamalainen <ccr@tnsp.org> parents: 173 diff changeset	743 widgets.keyPressed(e);
2 1785f66a7beb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	744 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	745
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	746 public void run()
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	747 {
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	748 while (animEnable)
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	749 {
26 3d4cc47df31a Cleanups, fix piece rendering and rotation. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	750 // Progress game animation clock
144 f01cb1ea26a5 Add some decorative animated elements. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	751 gameUpdates++;
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	752
26 3d4cc47df31a Cleanups, fix piece rendering and rotation. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	753 // Animate components
164 2b2fa62cfea5 Fix animation timing. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	754 int tmp = (int) ((System.currentTimeMillis() - startTime) / 10f);
2b2fa62cfea5 Fix animation timing. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	755 lauta.animate(tmp);
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	756
26 3d4cc47df31a Cleanups, fix piece rendering and rotation. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	757 // Repaint with a frame limiter
168 159252f9480d Fix animation choppiness. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	758 if (gameUpdates % 2 == 1)
10 4bacc98973f5 More work. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	759 repaint();
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	760
26 3d4cc47df31a Cleanups, fix piece rendering and rotation. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	761 // Sleep for a moment
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	762 try {
168 159252f9480d Fix animation choppiness. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	763 Thread.sleep(15);
9 a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	764 }
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	765 catch (InterruptedException x) {
a7751971c2a3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	766 }
8 d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	767 }
d8e7fd8f3ccf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	768 }
134 4c0dec72e2f0 Whitespace cosmetic cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	769
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	770 class BtnNewGame extends IDMButton
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	771 {
51 f81f76458b92 Work on widgets. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	772 public BtnNewGame(float x, float y)
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	773 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	774 super(x, y, KeyEvent.VK_ESCAPE, G.fonts[1], "New Game");
49 e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	775 }
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	776
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	777 public void clicked()
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	778 {
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	779 startNewGame();
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	780 }
e6da5c71be28 Add more code to IDM widgets, do preliminary work for integrating them. Matti Hamalainen <ccr@tnsp.org> parents: 48 diff changeset	781 }
50 496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	782
496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	783 class BtnSwapPiece extends IDMButton
496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	784 {
51 f81f76458b92 Work on widgets. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	785 public BtnSwapPiece(float x, float y)
50 496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	786 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	787 super(x, y, KeyEvent.VK_SPACE, G.fonts[1], "Swap");
50 496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	788 }
496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	789
496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	790 public void clicked()
496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	791 {
54 cc7943cd7f2d Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	792 lauta.pieceSwapCurrent();
50 496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	793 }
496e616ff09d More work on IDMgui. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	794 }
60 4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	795
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	796 class BtnAbout extends IDMButton
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	797 {
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	798 public BtnAbout(float x, float y)
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	799 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	800 super(x, y, KeyEvent.VK_A, G.fonts[1], "About");
60 4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	801 }
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	802
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	803 public void clicked()
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	804 {
75 b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	805 if (!widgets.containsObject(aboutBox))
b586ce4f6d97 Large GUI code cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	806 widgets.add(aboutBox);
60 4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	807 }
4a984e3b27d2 Cleanups. Add a ad-hoc about box, it's ugly. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	808 }
0 f930f72ed0f5 Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 }

Mercurial > hg > ristipolku

annotate game/Engine.java @ 179:ac5cf78a1cd2