Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProjetZZ1
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marc BERET
ProjetZZ1
Commits
9a1b3f08
Commit
9a1b3f08
authored
Jun 28, 2022
by
maberet
Browse files
Options
Downloads
Patches
Plain Diff
coorection des erreurs
parent
8347de9c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
travail_de_groupe/jeu_appren_par_renfo/src/ball.c
+4
-4
4 additions, 4 deletions
travail_de_groupe/jeu_appren_par_renfo/src/ball.c
travail_de_groupe/jeu_appren_par_renfo/src/ball.h
+1
-1
1 addition, 1 deletion
travail_de_groupe/jeu_appren_par_renfo/src/ball.h
with
5 additions
and
5 deletions
travail_de_groupe/jeu_appren_par_renfo/src/ball.c
+
4
−
4
View file @
9a1b3f08
...
...
@@ -37,7 +37,7 @@ float defineAngle (canon_t canon, int xDropPoint, int yDropPoint){
void
calculationTrajectory
(
canon_t
canon
,
int
xDropPoint
,
int
yDropPoint
){
int
i
;
in
t
setUp
[
2
][
3
];
floa
t
setUp
[
2
][
3
];
float
distance
=
(
float
)(
yDropPoint
-
canon
.
y
);
trajectory
[
0
][
0
]
=
canon
.
y
;
...
...
@@ -46,11 +46,11 @@ void calculationTrajectory(canon_t canon, int xDropPoint, int yDropPoint){
trajectory
[
NUMBERPOINT
-
1
][
0
]
=
yDropPoint
;
trajectory
[
NUMBERPOINT
-
1
][
1
]
=
0
;
setUp
[
0
][
0
]
=
canon
.
y
;
setUp
[
0
][
0
]
=
(
float
)
canon
.
y
;
setUp
[
0
][
1
]
=
0
;
setUp
[
1
][
0
]
=
yDropPoint
;
setUp
[
1
][
0
]
=
(
float
)
yDropPoint
;
setUp
[
1
][
1
]
=
0
;
setUp
[
2
][
0
]
=
(
int
)(
13
,
40
/
2
);
// distance du filet dans le repère de frappe
setUp
[
2
][
0
]
=
(
13
.
40
/
2
);
// distance du filet dans le repère de frappe
setUp
[
2
][
1
]
=
1
.
65
;
/// hauteur du filet
laGrange
(
setUp
[
0
],
setUp
[
1
]);
...
...
This diff is collapsed.
Click to expand it.
travail_de_groupe/jeu_appren_par_renfo/src/ball.h
+
1
−
1
View file @
9a1b3f08
...
...
@@ -35,6 +35,6 @@ extern int trajectory[NUMBERPOINT][2];
void
initBall
();
void
laGrange
(
float
beta
[
3
],
float
Z
[
3
]);
float
defineAngle
(
canon_t
,
int
,
int
);
void
calculationTrajectory
(
canon_t
,
float
,
int
,
int
);
void
calculationTrajectory
(
canon_t
,
int
,
int
);
#endif
\ No newline at end of file
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
sign in
to comment