Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Galaxy_Simulator
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
Model registry
Operate
Environments
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
benjamin.sitbon
Galaxy_Simulator
Commits
f0c1428c
Commit
f0c1428c
authored
6 years ago
by
Benjamin-Sitbon
Browse files
Options
Downloads
Patches
Plain Diff
comments
parent
f7a50389
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.idea/workspace.xml
+32
-34
32 additions, 34 deletions
.idea/workspace.xml
galaxy.c
+1
-1
1 addition, 1 deletion
galaxy.c
quad_tree.c
+4
-0
4 additions, 0 deletions
quad_tree.c
with
37 additions
and
35 deletions
.idea/workspace.xml
+
32
−
34
View file @
f0c1428c
...
...
@@ -10,10 +10,8 @@
</component>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"43aff179-c306-46b9-b69f-eca5306fbf96"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/Box.c"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Box.c"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Star.c"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Star.c"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Star.h"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Star.h"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/galaxy.c"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/galaxy.c"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/quad_tree.c"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/quad_tree.c"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -59,11 +57,11 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/galaxy.c"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
442
"
>
<caret
line=
"95"
column=
"7
4
"
selection-start-line=
"95"
selection-start-column=
"7
4
"
selection-end-line=
"95"
selection-end-column=
"7
4
"
/>
<state
relative-caret-position=
"
340
"
>
<caret
line=
"95"
column=
"7
3
"
selection-start-line=
"95"
selection-start-column=
"7
3
"
selection-end-line=
"95"
selection-end-column=
"7
3
"
/>
</state>
</provider>
</entry>
...
...
@@ -77,11 +75,11 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/quad_tree.c"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
155
"
>
<caret
line=
"1
0
"
column=
"
4
"
selection-start-line=
"1
0
"
selection-start-column=
"
4
"
selection-end-line=
"1
0
"
selection-end-column=
"
4
"
/>
<state
relative-caret-position=
"
257
"
>
<caret
line=
"1
7
"
column=
"
81
"
selection-start-line=
"1
7
"
selection-start-column=
"
81
"
selection-end-line=
"1
7
"
selection-end-column=
"
81
"
/>
</state>
</provider>
</entry>
...
...
@@ -130,11 +128,11 @@
<option
value=
"$PROJECT_DIR$/makefile"
/>
<option
value=
"$PROJECT_DIR$/quad_tree.h"
/>
<option
value=
"$PROJECT_DIR$/Box.h"
/>
<option
value=
"$PROJECT_DIR$/quad_tree.c"
/>
<option
value=
"$PROJECT_DIR$/Box.c"
/>
<option
value=
"$PROJECT_DIR$/Star.h"
/>
<option
value=
"$PROJECT_DIR$/Star.c"
/>
<option
value=
"$PROJECT_DIR$/galaxy.c"
/>
<option
value=
"$PROJECT_DIR$/quad_tree.c"
/>
</list>
</option>
</component>
...
...
@@ -192,12 +190,12 @@
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1559227081243
</updated>
<workItem
from=
"1559227084365"
duration=
"53793000"
/>
<workItem
from=
"1560336527698"
duration=
"3
8917
000"
/>
<workItem
from=
"1560336527698"
duration=
"3
9245
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"9
2710
000"
/>
<option
name=
"totallyTimeSpent"
value=
"9
3038
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-7"
y=
"-7"
width=
"1550"
height=
"838"
extended-state=
"6"
/>
...
...
@@ -275,13 +273,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Box.h"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"187"
>
<caret
line=
"11"
column=
"37"
selection-start-line=
"11"
selection-start-column=
"37"
selection-end-line=
"11"
selection-end-column=
"37"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/galaxy.h"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"340"
>
...
...
@@ -289,24 +280,24 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
quad_tree.c
"
>
<entry
file=
"file://$PROJECT_DIR$/
Star.h
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"15
5
"
>
<caret
line=
"
10"
column=
"4
"
selection-start-line=
"
10"
selection-start-column=
"4"
selection-end-line=
"10"
selection-end-column=
"4
"
/>
<state
relative-caret-position=
"15
3
"
>
<caret
line=
"
9
"
selection-start-line=
"
9"
selection-end-line=
"9
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
quad_tree.h
"
>
<entry
file=
"file://$PROJECT_DIR$/
Star.c
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"23
8
"
>
<caret
line=
"
1
4"
column=
"
35
"
selection-start-line=
"
1
4"
selection-start-column=
"
35
"
selection-end-line=
"
1
4"
selection-end-column=
"
35
"
/>
<state
relative-caret-position=
"
3
23"
>
<caret
line=
"4
0
"
column=
"
44
"
selection-start-line=
"4
0
"
selection-start-column=
"
44
"
selection-end-line=
"4
0
"
selection-end-column=
"
44
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
Star.h
"
>
<entry
file=
"file://$PROJECT_DIR$/
galaxy.c
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
153
"
>
<caret
line=
"9"
selection-start-line=
"9
"
selection-end-line=
"9
"
/>
<state
relative-caret-position=
"
340
"
>
<caret
line=
"9
5"
column=
"73
"
selection-start-line=
"9
5"
selection-start-column=
"73"
selection-end-line=
"95"
selection-end-column=
"73
"
/>
</state>
</provider>
</entry>
...
...
@@ -317,17 +308,24 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
Star.c
"
>
<entry
file=
"file://$PROJECT_DIR$/
Box.h
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
323
"
>
<caret
line=
"
40
"
column=
"
44
"
selection-start-line=
"
40
"
selection-start-column=
"
44
"
selection-end-line=
"
40
"
selection-end-column=
"
44
"
/>
<state
relative-caret-position=
"
187
"
>
<caret
line=
"
11
"
column=
"
37
"
selection-start-line=
"
11
"
selection-start-column=
"
37
"
selection-end-line=
"
11
"
selection-end-column=
"
37
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/galaxy.c"
>
<entry
file=
"file://$PROJECT_DIR$/quad_tree.h"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"238"
>
<caret
line=
"14"
column=
"35"
selection-start-line=
"14"
selection-start-column=
"35"
selection-end-line=
"14"
selection-end-column=
"35"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/quad_tree.c"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
442
"
>
<caret
line=
"
95
"
column=
"
74
"
selection-start-line=
"
95
"
selection-start-column=
"
74
"
selection-end-line=
"
95
"
selection-end-column=
"
74
"
/>
<state
relative-caret-position=
"
257
"
>
<caret
line=
"
17
"
column=
"
81
"
selection-start-line=
"
17
"
selection-start-column=
"
81
"
selection-end-line=
"
17
"
selection-end-column=
"
81
"
/>
</state>
</provider>
</entry>
...
...
This diff is collapsed.
Click to expand it.
galaxy.c
+
1
−
1
View file @
f0c1428c
This diff is collapsed.
Click to expand it.
quad_tree.c
+
4
−
0
View file @
f0c1428c
...
...
@@ -7,16 +7,20 @@
quad_tree
*
create_quad_tree_from_galaxy
(
const
galaxy
*
const
g
){
//Allocation du quad_tree et du noeud racine
quad_tree
*
galaxy
=
malloc
(
sizeof
(
quad_tree
*
));
node
*
root
=
malloc
(
sizeof
(
node
*
));
//Attribution des valeurs nécéssaire
galaxy
->
root
->
b
=
g
->
b
;
galaxy
->
root
->
is_empty
=
true
;
galaxy
->
root
->
s
=
NULL
;
galaxy
->
root
->
children
=
NULL
;
//Création de la super étoile avec un masse null et placé au centre de la box
galaxy
->
root
->
super_s
=
new_star_vel
((
vec
){
mid_point
(
g
->
b
.
x0
,
g
->
b
.
x1
),
mid_point
(
g
->
b
.
y0
,
g
->
b
.
y1
)},(
vec
){
0
.
0
,
0
.
0
},(
vec
){
0
.
0
,
0
.
0
},
0
.
0
,
0
.
0
);
}
//Suit à la lettre la fonction décrite dans l'énoncé
void
insert_star
(
node
*
n
,
star
*
s
){
if
(
is_inside
(
n
->
b
,
s
)
&&
n
!=
NULL
){
...
...
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