Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
javaProj
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Oscar Wiberg
javaProj
Commits
bc2c67aa
Commit
bc2c67aa
authored
1 year ago
by
Oscar Wiberg
Browse files
Options
Downloads
Patches
Plain Diff
enemy flyttad till enemy class
parent
3464ea4f
No related branches found
No related tags found
1 merge request
!1
Testb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/states/Enemy.java
+45
-0
45 additions, 0 deletions
src/states/Enemy.java
src/states/PlayState.java
+20
-4
20 additions, 4 deletions
src/states/PlayState.java
with
65 additions
and
4 deletions
src/states/Enemy.java
0 → 100644
+
45
−
0
View file @
bc2c67aa
package
states
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
constants.Constants
;
import
javafx.scene.image.Image
;
public
class
Enemy
{
private
double
enemyX
=
-
100.00
;
private
double
enemyY
=
250.00
;
private
Image
image
;
public
Enemy
(
String
enemyImg
)
{
try
{
image
=
new
Image
(
new
FileInputStream
(
enemyImg
));
}
catch
(
FileNotFoundException
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
}
public
void
setEnemyX
(
double
pos
)
{
this
.
enemyX
=
pos
;
}
public
Image
getImage
()
{
return
image
;
}
public
double
getEnemyX
()
{
return
enemyX
;
}
public
double
getEnemyY
()
{
return
enemyY
;
}
}
This diff is collapsed.
Click to expand it.
src/states/PlayState.java
+
20
−
4
View file @
bc2c67aa
...
...
@@ -42,6 +42,7 @@ public class PlayState extends GameState {
private
Double
enemyPosY
=
250.00
;
private
boolean
up
=
false
;
private
Player
player
;
private
Enemy
enemy
;
/* Class only used for testing */
...
...
@@ -54,6 +55,8 @@ public class PlayState extends GameState {
fontColor
=
Color
.
BLUE
;
player
=
new
Player
(
Constants
.
playerImg
);
enemy
=
new
Enemy
(
Constants
.
enemyImg
);
try
{
obstacle
=
new
Image
(
new
FileInputStream
(
Constants
.
enemyImg
));
...
...
@@ -80,12 +83,17 @@ public class PlayState extends GameState {
g
.
setLineDashes
(
2
);
g
.
strokeLine
(
Constants
.
screenWidth
,
350
,
0
,
350
);
if
(
enemyPosX
<
0
-
Constants
.
enemyWidth
)
{
enemyPosX
=
Constants
.
screenWidth
;
// if (enemyPosX < 0 - Constants.enemyWidth) {
// enemyPosX = Constants.screenWidth;
// }
if
(
enemy
.
getEnemyX
()
<
0
-
Constants
.
enemyWidth
)
{
enemy
.
setEnemyX
(
Constants
.
screenWidth
);
}
g
.
drawImage
(
player
.
getImage
(),
player
.
getPlayerX
(),
player
.
getPlayerY
(),
Constants
.
playerWidth
,
Constants
.
playerHeight
);
g
.
drawImage
(
obstacle
,
enemyPosX
,
enemyPosY
,
Constants
.
enemyWidth
,
Constants
.
enemyHeight
);
// g.drawImage(obstacle, enemyPosX, enemyPosY, Constants.enemyWidth, Constants.enemyHeight);
g
.
drawImage
(
enemy
.
getImage
(),
enemy
.
getEnemyX
(),
enemy
.
getEnemyY
(),
Constants
.
enemyWidth
,
Constants
.
enemyHeight
);
}
@Override
...
...
@@ -106,7 +114,11 @@ public class PlayState extends GameState {
@Override
public
void
update
()
{
enemyPosX
-=
10
;
// enemyPosX -= 10;
enemy
.
setEnemyX
(
enemy
.
getEnemyX
()-
10
);
if
(
up
)
{
...
...
@@ -118,6 +130,10 @@ public class PlayState extends GameState {
}
}
public
void
checkCollision
()
{
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment