Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ISN 2022-ACL project Cyberpac 2077
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
RICHARD Florian
ISN 2022-ACL project Cyberpac 2077
Commits
e85007cd
Commit
e85007cd
authored
2 years ago
by
Louis MALTERRE
Browse files
Options
Downloads
Patches
Plain Diff
j'ai remis de l'ordre dans entity, character et jeu LM
parent
20ce0286
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
MAVENProject/src/main/java/entity/Character.java
+2
-2
2 additions, 2 deletions
MAVENProject/src/main/java/entity/Character.java
MAVENProject/src/main/java/jeu/Jeu.java
+1
-1
1 addition, 1 deletion
MAVENProject/src/main/java/jeu/Jeu.java
with
3 additions
and
3 deletions
MAVENProject/src/main/java/entity/Character.java
+
2
−
2
View file @
e85007cd
...
...
@@ -29,9 +29,9 @@ public class Character extends Entity{
public
Character
(
Coordonnees
c
,
double
vitesseMax
,
double
m
,
double
impSaut
,
double
width
,
double
height
){
public
Character
(
Coordonnees
c
,
double
vitesseMax
,
double
m
,
double
impSaut
){
super
(
c
,
vitesseMax
,
width
,
height
);
// comme tous les entities ont une hitbox, j'ai factorise
super
(
c
,
vitesseMax
,
30
,
60
);
// comme tous les entities ont une hitbox, j'ai factorise
this
.
masse
=
m
;
this
.
impulsionSaut
=
impSaut
;
this
.
setHitBox
(
new
HitBox
(
c
,
entityHEIGHT
,
entityWIDTH
));
...
...
This diff is collapsed.
Click to expand it.
MAVENProject/src/main/java/jeu/Jeu.java
+
1
−
1
View file @
e85007cd
...
...
@@ -70,7 +70,7 @@ public class Jeu implements Game{
characterSkinPath
=
beginPath
+
movement
+
numberOfMovement
+
".png"
;
// path premiere frame
/*A = new ArrayList<Double>();
n = 0;*/
gameCharacterLoader
=
new
CharacterLoader
(
characterSkinPath
,
new
Character
(
new
Coordonnees
(
300
,
300
),
2000
,
1
,
600000
,
30
,
60
));
gameCharacterLoader
=
new
CharacterLoader
(
characterSkinPath
,
new
Character
(
new
Coordonnees
(
300
,
300
),
2000
,
1
,
600000
));
gameCharacter
=
gameCharacterLoader
.
getGameCharacter
();
try
{
helpReader
=
new
BufferedReader
(
new
FileReader
(
source
));
...
...
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