Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ACL_M1_Info
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
Show more breadcrumbs
AMET Matthieu
ACL_M1_Info
Commits
d2bc66cb
Commit
d2bc66cb
authored
2 years ago
by
iiztp
Browse files
Options
Downloads
Patches
Plain Diff
Update du readme, mise a jour camera
parent
cb7a41f6
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+3
-3
3 additions, 3 deletions
README.md
core/src/main/java/com/dala/mapz/CollisionListener.java
+0
-1
0 additions, 1 deletion
core/src/main/java/com/dala/mapz/CollisionListener.java
core/src/main/java/com/dala/mapz/Mapz.java
+7
-3
7 additions, 3 deletions
core/src/main/java/com/dala/mapz/Mapz.java
with
10 additions
and
7 deletions
README.md
+
3
−
3
View file @
d2bc66cb
...
...
@@ -33,11 +33,11 @@ Lien document https://docs.google.com/document/d/1eMIz-gtYh0LyKd3zt9C5dxYCf8wkyS
-
[X] Création du projet avec compilation libgdx
-
[X] Map par défaut - Matthieu
-
[X] Placement personnage - Paul
-
[
] Mouvement personnage - Arthur
-
[
] Passage à travers les portes personnage - Zinedine
-
[
X
] Mouvement personnage - Arthur
-
[
X
] Passage à travers les portes personnage - Zinedine
-
[X] Collision avec les murs personnage - Paul, Zinedine
-
[
] Test de chaque fonctionnalité - Arthur, Paul, Matthieu, Zinedine
-
[
X
] Test de chaque fonctionnalité - Arthur, Paul, Matthieu, Zinedine
### Diagramme de classes Sprint0
...
...
This diff is collapsed.
Click to expand it.
core/src/main/java/com/dala/mapz/CollisionListener.java
+
0
−
1
View file @
d2bc66cb
...
...
@@ -24,7 +24,6 @@ public class CollisionListener implements ContactListener {
}
else
return
;
if
(
userData
instanceof
Door
door
){
System
.
out
.
println
(
"collision ....... door"
);
Mapz
.
getGameInstance
().
getCurrentDungeon
().
goThroughDoor
(
door
);
}
}
...
...
This diff is collapsed.
Click to expand it.
core/src/main/java/com/dala/mapz/Mapz.java
+
7
−
3
View file @
d2bc66cb
...
...
@@ -53,9 +53,6 @@ public class Mapz extends Game {
room1
.
loadRoom
(
world
);
box2DDebugRenderer
=
new
Box2DDebugRenderer
();
camera
=
new
OrthographicCamera
();
camera
.
setToOrtho
(
false
,
currentDungeon
.
getLoadedRoom
().
getWidth
(),
currentDungeon
.
getLoadedRoom
().
getHeight
());
}
@Override
...
...
@@ -82,8 +79,15 @@ public class Mapz extends Game {
else
player
.
getBody
().
setLinearVelocity
(
0
f
,
0
f
);
}
private
void
updateCamera
()
{
camera
.
setToOrtho
(
false
,
currentDungeon
.
getLoadedRoom
().
getWidth
(),
currentDungeon
.
getLoadedRoom
().
getHeight
());
}
public
void
update
(){
updatePlayer
();
updateCamera
();
WorldManager
.
instance
.
update
();
}
...
...
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