Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SocialAgents3D
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
SocialAgents3D
Commits
b80a842a
Commit
b80a842a
authored
Nov 29, 2012
by
Jund Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
import route ok
parent
4ff9c22a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
75 additions
and
93 deletions
+75
-93
include/env_generator.hpp
include/env_generator.hpp
+9
-0
include/env_map.h
include/env_map.h
+1
-1
src/env_map.cpp
src/env_map.cpp
+5
-3
src/simulator.cpp
src/simulator.cpp
+4
-1
svg/mapCleaned.svg
svg/mapCleaned.svg
+16
-47
svg/mapRoads.svg
svg/mapRoads.svg
+25
-27
svg/simpleCross.svg
svg/simpleCross.svg
+15
-14
No files found.
include/env_generator.hpp
View file @
b80a842a
...
...
@@ -49,6 +49,15 @@ Algo::Modelisation::Polyhedron<PFP> generateGrid(EnvMap& envMap)
Dart
d
=
prim
.
grid_topo
(
nx
,
ny
)
;
prim
.
embedGrid
(
envMap
.
geometry
.
size
(
0
),
envMap
.
geometry
.
size
(
1
),
0.0
f
)
;
// envMap.agentvect = envMap.map.addAttribute<typename PFP::AGENTVECT, FACE>("agents") ;
// envMap.neighborAgentvect = envMap.map.addAttribute<typename PFP::AGENTVECT, FACE>("neighborAgents") ;
// envMap.obstvect = envMap.map.addAttribute<typename PFP::OBSTACLEVECT, FACE>("obstacles") ;
// envMap.neighborObstvect = envMap.map.addAttribute<typename PFP::OBSTACLEVECT, FACE>("neighborObstacles") ;
// envMap.subdivisableFace = envMap.map.addAttribute<typename PFP::BOOLATTRIB, FACE>("subdivisableFace") ;
//
// envMap.refineCandidate.reserve(100) ;
// envMap.coarsenCandidate.reserve(100) ;
Dart
boundary
=
envMap
.
map
.
phi2
(
d
)
;
envMap
.
buildingMark
.
mark
(
boundary
)
;
...
...
include/env_map.h
View file @
b80a842a
...
...
@@ -149,7 +149,7 @@ public:
#ifndef SPATIAL_HASHING
static
const
unsigned
int
nbAgentsToSubdivide
=
5
;
static
const
unsigned
int
nbAgentsToSimplify
=
1
;
static
const
unsigned
int
nbAgentsToSimplify
=
4
;
CellMarker
<
FACE
>
refineMark
;
CellMarker
<
FACE
>
coarsenMark
;
...
...
src/env_map.cpp
View file @
b80a842a
...
...
@@ -86,8 +86,9 @@ void EnvMap::init(unsigned int config, REAL width, REAL height, REAL minSize, RE
break
;
case
5
:
{
// std::string filename = "./svg/mapRoads.svg" ;
std
::
string
filename
=
"./svg/simpleCross.svg"
;
std
::
cout
<<
"?"
<<
std
::
endl
;
std
::
string
filename
=
"./svg/mapRoads.svg"
;
// std::string filename = "./svg/simpleCross.svg" ;
Algo
::
Import
::
importSVG
<
PFP
>
(
map
,
filename
,
position
,
obstacleMark
,
buildingMark
)
;
// Algo::BooleanOperator::mergeVertices<PFP>(map, position) ;
...
...
@@ -547,7 +548,8 @@ void EnvMap::pushObstacleInCells(Obstacle* o, int n, const std::vector<Dart>& me
for
(
std
::
vector
<
Dart
>::
iterator
it
=
mo
->
neighbor_cells
[
n
].
begin
();
it
!=
mo
->
neighbor_cells
[
n
].
end
();
++
it
)
{
// CGoGNout <<"obstacle"<< o->p1 << "new cell : "<< *it << CGoGNendl;
pushObstNeighborInCells
(
o
,
*
it
);
addElementToVector
<
Obstacle
*>
(
neighborObstvect
[
*
it
],
o
);
// pushObstNeighborInCells(o, *it);
}
}
...
...
src/simulator.cpp
View file @
b80a842a
...
...
@@ -18,7 +18,7 @@ Simulator::Simulator(int minS) :
detect_agent_collision
=
false
;
srand
(
10
)
;
nbStepsPerUnit_
=
1
/
timeStep_
;
config
=
1
;
config
=
5
;
init
(
minSize
,
2.0
f
)
;
}
...
...
@@ -56,6 +56,9 @@ void Simulator::init( float dimension, bool enablePathFinding)
// case 4 :
// importAgents("myAgents.pos") ;
// break ;
case
5
:
envMap_
.
init
(
config
,
1600.0
f
,
960.0
f
,
minSize
,
20.0
f
)
;
//cases fines
break
;
}
#ifndef SPATIAL_HASHING
...
...
svg/mapCleaned.svg
View file @
b80a842a
...
...
@@ -39,9 +39,9 @@
inkscape:window-height="1021"
id="namedview20587"
showgrid="false"
inkscape:zoom="
1.8101934
"
inkscape:cx="1
088.7843
"
inkscape:cy="
1125.4206
"
inkscape:zoom="
2.5600001
"
inkscape:cx="1
270.5016
"
inkscape:cy="
245.44341
"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
...
...
@@ -14944,11 +14944,6 @@
d="M 1268.3555,154.52344 1304.9531,51.203125"
id="path6199"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:5.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;color:#000000;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 360.75781,110.60938 17.3711,-0.25 51.03906,-7.41407 -0.95313,-28.300779 -12.61718,-6.960937 -54.83985,42.925786 -31.23047,33.40624"
id="path6201"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:5.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;color:#000000;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 181.64453,906.33594 -7.44141,7.35937 -19.21093,18.29688 -23.32813,19.41015 -23.76562,6.96094 -24.480471,7.60938 -15.117188,4.22265"
...
...
@@ -15036,10 +15031,11 @@
id="path6277"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:9.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 479.64453,254.55469 12.28125,-4.83985 3.95703,-1.83593
98.66797,-45.66407 5.1875,-2.39453 3.24219,-1.52344
"
style="fill:none;stroke:#bababa;stroke-width:9.6
0000038
;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 479.64453,254.55469 12.28125,-4.83985 3.95703,-1.83593
C 531.10334,231.41706 567.89509,214.80924 602.4,198.6
"
id="path6279"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 710.53906,733.60547 -7.92578,-11.07422 -35.83984,-50.125 -20.74219,-15.03516 -20.03906,-7.76562 -13.01953,-2.76172 -38.26172,0.98828 -58.22266,5.39453 -56.55859,-15.67187 -14.69922,-4.08594"
...
...
@@ -15082,14 +15078,16 @@
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 1240.7695,1023.1875 -109.5039,-13.7969 -59.5508,-7.5039 -12.1367,-1.3633 -13.0898,-1.41012 -8.4414,-2.55859 -4.5547,-5.01953 -2.5742,-5.54297 -9.793,-32.96094 -1.1445,-3.30859 -1.8594,-3.78907 -2.7813,-2.55078
-37.32027,-4.53515 -39.76172,-4.37891
-12.01172,-1.69922 -9.69922,-2.17187 -14.17187,-4.5586 -10.50781,-5.91015 -88.6211,-54.35547 -14.14062,-9.26953 -10.10938,-6.75 -8.87109,-5.92969 -8.05078,-6.64844 -7.6211,-6.83203 -7.01562,-8.41797 -5.73047,-8.67187 -5.13281,-9.125 -5.375,-9.57032 -19.0625,-35.67187 -7.66406,-14.35156"
d="m 1240.7695,1023.1875 -109.5039,-13.7969 -59.5508,-7.5039 -12.1367,-1.3633 -13.0898,-1.41012 -8.4414,-2.55859 -4.5547,-5.01953 -2.5742,-5.54297 -9.793,-32.96094 -1.1445,-3.30859 -1.8594,-3.78907 -2.7813,-2.55078
L 977.6,939.4 l -39.34219,-4.93125
-12.01172,-1.69922 -9.69922,-2.17187 -14.17187,-4.5586 -10.50781,-5.91015 -88.6211,-54.35547 -14.14062,-9.26953 -10.10938,-6.75 -8.87109,-5.92969 -8.05078,-6.64844 -7.6211,-6.83203 -7.01562,-8.41797 -5.73047,-8.67187 -5.13281,-9.125 -5.375,-9.57032 -19.0625,-35.67187 -7.66406,-14.35156"
id="path6313"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccccccccccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 97
8.01953,938.84766 -17.41406,1.375 -10.96875,1.8789 -9.09375,2.20313 -9.40625,3.1289 -7.21094,3.75782
-6.89453,4.70312 -149.17578,150.02347"
d="m 97
7.6,939.4 c -21.29059,2.67059 -36.60804,2.89775 -53.67422,11.79141 l
-6.89453,4.70312 -149.17578,150.02347"
id="path6315"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="M 560.98047,901.38281 572.72656,906 l 8.70313,8.80859 8.6914,8.87891 21.88672,22.36328 8.50391,5.24609 16.11328,1.73438 55.74219,6.02344 9.1875,-1.83594 6.27734,-2.84375 6.01563,-4.11719 89.39843,-84.48437"
...
...
@@ -15157,9 +15155,10 @@
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="
m 593.00781,175.03516 9.97266,23.26171 16.57422,28.96485
44.22656,74.02734 3.79297,12.23047 3.13672,9.57422 3.41406,10.43359"
d="
M 593.00781,175.03516 602.4,198.6 l 17.15469,28.66172
44.22656,74.02734 3.79297,12.23047 3.13672,9.57422 3.41406,10.43359"
id="path6349"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="M 194.38672,617.39844 210,631.47656 l 68.09766,61.36719 7.98828,7.20312 6.92968,6.00391 69.17969,60.00391 8.91016,7.73828 15.0039,6.26562 79.15235,56.17578 81.07422,60.53907 14.64453,4.60937"
...
...
@@ -15216,11 +15215,6 @@
d="m 587.29687,158.67969 1.85938,6.84375 3.85156,9.51172"
id="path6375"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 1015.3398,943.38281 6.0704,0.92188 4.082,1.25 3.7578,2.51172 1.5625,3.125 9.3984,31.96875 1.5743,4.08203 2.1914,3.75781 3.4453,3.12891 4.3984,2.82421 7.7578,3.57028"
id="path6377"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 271.44141,164.41016 -21.85547,-33.48829 -17.41797,-28.98437 -5.875,-9.5"
...
...
@@ -16399,11 +16393,6 @@
d="m 322.54297,391.28906 13.79687,-14.55078 6.75782,6.91797 -8.38672,8.42969 3.67578,3.39062 3.39844,-4.11719 1.24218,1.00782 4.05078,-4.81641 12.30469,11.59766 -5.84765,7.14062 -6.375,7.75781 -13.1211,-11.71484 -11.01172,-10.45703 -0.48437,-0.58594"
id="path6973"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 350.14453,85.457031 25.73828,-21.351562 0.92578,1.144531 9.91016,12.367188 -25.63672,21.121093 -4.15625,-4.683593 -5.57422,-6.726563 0.11328,-0.210937 -1.32031,-1.660157"
id="path6975"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 1049.7617,289.85859 2.6446,-8.9875 2.8906,-14.0039 10.1601,2.71875 -0.1679,0.54687 14.875,4.54688 -1.3438,3.55859 -2.5312,5.11328 -0.5039,-0.21094 -7.7579,12.76485 -18.2656,-6.04688 m 12.3047,-10.9289 7.8516,2.58203 1.375,-4.08203 -7.9024,-2.45703 -1.3242,3.95703"
...
...
@@ -16591,11 +16580,6 @@
d="m 654.28125,918.21875 0.65234,-5.58203 1.71094,-14.625 4.67188,-39.8086 8.59765,0.94532 -7.35937,59.90234 -8.27344,-0.83203"
id="path7055"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 376.80859,65.25 23.8086,-19.589844 10.03515,12.378906 -7.29687,6.183594 0.93359,1.207032 -9.33203,7.523437 -0.96484,-1.183594 -7.27344,5.847657 L 376.80859,65.25"
id="path7057"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 336.33984,376.73828 13.70703,-13.99609 21.98438,21.29297 -6.46875,7.73437 -6.17969,7.37891 -12.30469,-11.59766 -3.98046,-3.89453 -6.75782,-6.91797 m 5.59375,1.07031 7.39063,7.21094 2.55078,-3.21094 -0.21875,-2.4375 2.35156,-2.83203 2.29688,0.0508 0.83984,-0.93359 -7.06641,-6.46484 -8.14453,8.61718"
...
...
@@ -17469,11 +17453,6 @@
d="m 591.19141,632.71484 6.59375,-15.26562 0.77734,0.3789 2.58984,-5.55468 5.125,2.58203 6.94922,3.49609 -1.74219,5.51172 -3.21484,9.93359 -7.35547,0.4375 -8.0625,0.47266 -1.66015,-1.99219"
id="path7455"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 325.45312,89.75 5.78516,-5.867188 8.13281,-7.328124 10.53907,11.90625 -13.61329,12.734372 -1.30078,-1.535154 -1.00781,0.597654 -6.91797,-8.093748 -0.3164,-0.859374 L 325.45312,89.75"
id="path7457"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 921.33203,505.13672 9.17578,-7.9375 8.27344,-7.12891 9.96094,10.76953 -1.33203,1.32422 -2.28907,-2.41406 -6.35156,4.94531 2.64453,2.90625 -2.32812,2.94922 -0.44141,0.10547 L 934.18359,516 921.33203,505.13672"
...
...
@@ -17545,11 +17524,6 @@
d="m 587.09766,337.57031 12.87109,-4.53515 11.08594,-3.90625 0.60547,7.83203 -6.4336,2.18359 3.875,6.5 -10.21484,6.85547 -5.81641,-7.35938 -5.97265,-7.57031"
id="path7491"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 336.29687,101.19531 13.61329,-12.734372 1.4414,-1.132813 5.57422,6.726563 4.15625,4.683593 -14.96875,12.703129 -4.09375,-4.52735 -0.37109,0.33594 -5.35157,-6.05469"
id="path7493"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 130.14062,467.10156 10.55079,-11.3164 8.65234,8.15625 7.36719,6.96093 -8.87891,9.69922 -8.69141,-6.75 2.65625,-3.05469 -3.625,-3.43359 -3.08593,3.33984 -4.94532,-3.60156"
...
...
@@ -18462,11 +18436,6 @@
d="m 570.45703,571.17578 1.73438,-7.08594 5.28906,1.98438 -1.87891,6.58203 -5.14453,-1.48047"
id="path7927"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.90000000000000002;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;color:#000000;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 393.04415,96.433987 22.0237,-17.018742 6.47003,7.397828 -12.95976,10.218718 -14.76469,0.68187 -0.76928,-1.279674"
id="path7929"
inkscape:connector-curvature="0" />
<path
style="fill:#baa8a8;fill-opacity:0.9;fill-rule:nonzero;stroke:#330066;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 616.07031,304.26172 4.24219,-0.91406 1.07031,8.85937 -4.19922,-0.13672 -1.11328,-7.80859"
svg/mapRoads.svg
View file @
b80a842a
...
...
@@ -39,13 +39,15 @@
inkscape:window-height="994"
id="namedview20587"
showgrid="false"
inkscape:zoom="
0.6
4"
inkscape:cx="1
469.8027
"
inkscape:cy="
1124.4176
"
inkscape:zoom="
1.810193
4"
inkscape:cx="1
224.7448
"
inkscape:cy="
253.83295
"
inkscape:window-x="1680"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
inkscape:current-layer="svg2"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true" />
<defs
id="defs4">
<g
...
...
@@ -14928,11 +14930,6 @@
d="M 164.61719,501.41016 183.33594,518.38281 273.75,433.17187"
id="path6189"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:5.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;color:#000000;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 360.75781,110.60938 17.3711,-0.25 51.03906,-7.41407 -0.95313,-28.300779 -12.61718,-6.960937 -54.83985,42.925786 -31.23047,33.40624"
id="path6201"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:5.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;color:#000000;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 181.64453,906.33594 -7.44141,7.35937 -19.21093,18.29688 -23.32813,19.41015 -23.76562,6.96094 -24.480471,7.60938 -15.117188,4.22265"
...
...
@@ -15014,10 +15011,11 @@
id="path6277"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:9.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 479.64453,254.55469 12.28125,-4.83985 3.95703,-1.83593
98.66797,-45.66407 5.1875,-2.39453 3.24219,-1.52344
"
style="fill:none;stroke:#bababa;stroke-width:9.6
0000038
;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 479.64453,254.55469 12.28125,-4.83985 3.95703,-1.83593
C 531.10334,231.41706 567.89509,214.80924 602.4,198.6
"
id="path6279"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 710.53906,733.60547 -7.92578,-11.07422 -35.83984,-50.125 -20.74219,-15.03516 -20.03906,-7.76562 -13.01953,-2.76172 -38.26172,0.98828 -58.22266,5.39453 -56.55859,-15.67187 -14.69922,-4.08594"
...
...
@@ -15060,19 +15058,22 @@
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 1240.7695,1023.1875 -109.5039,-13.7969 -59.5508,-7.5039 -12.1367,-1.3633 -13.0898,-1.41012 -8.4414,-2.55859 -4.5547,-5.01953 -2.5742,-5.54297 -9.793,-32.96094 -1.1445,-3.30859 -1.8594,-3.78907 -2.7813,-2.55078
-37.32027,-4.53515 -39.76172,-4.37891 -12.01172,-1.69922 -9.69922,-2.17187 -14.17187,-4.5586 -10.50781,-5.91015 -88.6211,-54.35547 -14.14062,-9.26953 -10.10938,-6.75 -8.87109,-5.92969 -8.05078,-6.64844 -7.6211,-6.83203 -7.01562,-8.41797 -5.73047,-8.67187 -5.13281,-9.125 -5.375,-9.57032 -19.0625,-35.67187 -7.66406,-14.35156
"
d="m 1240.7695,1023.1875 -109.5039,-13.7969 -59.5508,-7.5039 -12.1367,-1.3633 -13.0898,-1.41012 -8.4414,-2.55859 -4.5547,-5.01953 -2.5742,-5.54297 -9.793,-32.96094 -1.1445,-3.30859 -1.8594,-3.78907 -2.7813,-2.55078
L 977.6,939.4 l -39.34219,-4.93125 -12.01172,-1.69922 -9.69922,-2.17187 -14.17187,-4.5586 -10.50781,-5.91015 c -37.1405,-22.87238 -78.48511,-46.89551 -112.8711,-70.375 -17.52026,-11.96321 -26.65988,-20.41496 -37.28906,-36.5 l -5.13281,-9.125 -5.375,-9.57032 c -8.91149,-16.67307 -17.82105,-33.34716 -26.72656,-50.02343
"
id="path6313"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccscccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 97
8.01953,938.84766 -17.41406,1.375 -10.96875,1.8789 -9.09375,2.20313 -9.40625,3.1289 -7.21094,3.75782 -6.89453,4.70312 -149.17578,150.02347
"
d="m 97
7.6,939.4 c -20.57401,4.70041 -44.5378,5.76895 -60.56875,16.49453 L 767.85547,1105.918
"
id="path6315"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="M 560.98047,901.38281 572.72656,906 l 8.70313,8.80859 8.6914,8.87891 21.88672,22.36328 8.50391,5.24609 16.11328,1.73438 55.74219,6.02344 9.1875,-1.83594 6.27734,-2.84375 6.01563,-4.11719
89.39843,-84.48437
"
d="M 560.98047,901.38281 572.72656,906 l 8.70313,8.80859 8.6914,8.87891 21.88672,22.36328 8.50391,5.24609 16.11328,1.73438 55.74219,6.02344 9.1875,-1.83594 6.27734,-2.84375 6.01563,-4.11719
65.14843,-100.5039
"
id="path6317"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 574.71094,647.83203 0.48047,12.10156 1.125,28.52344 -15.7461,41.24609 -20.47265,31.33594 -67.98047,68.28516 -6.85547,6.91015 -109.0625,113.66797"
...
...
@@ -15135,9 +15136,10 @@
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="
m 593.00781,175.03516 9.97266,23.26171 16.57422,28.96485
44.22656,74.02734 3.79297,12.23047 3.13672,9.57422 3.41406,10.43359"
d="
M 593.00781,175.03516 602.4,198.6 l 17.15469,28.66172
44.22656,74.02734 3.79297,12.23047 3.13672,9.57422 3.41406,10.43359"
id="path6349"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="M 194.38672,617.39844 210,631.47656 l 68.09766,61.36719 7.98828,7.20312 6.92968,6.00391 69.17969,60.00391 8.91016,7.73828 15.0039,6.26562 79.15235,56.17578 81.07422,60.53907 14.64453,4.60937"
...
...
@@ -15183,11 +15185,6 @@
d="m 587.29687,158.67969 1.85938,6.84375 3.85156,9.51172"
id="path6375"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 1015.3398,943.38281 6.0704,0.92188 4.082,1.25 3.7578,2.51172 1.5625,3.125 9.3984,31.96875 1.5743,4.08203 2.1914,3.75781 3.4453,3.12891 4.3984,2.82421 7.7578,3.57028"
id="path6377"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 271.44141,164.41016 -21.85547,-33.48829 -17.41797,-28.98437 -5.875,-9.5"
...
...
@@ -15195,9 +15192,10 @@
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#bababa;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="m 917.03125,955.89453
2.50781,-6.57031 -0.6289,-6.59375 -2.1836,-6.90625 -4.07422,-4.0625 -10.27734,-5.72266
"
d="m 917.03125,955.89453
c 6.4106,-13.62585 -4.68488,-24.28891 -14.65625,-29.85547
"
id="path6383"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#bababa;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 375.23437,199.58984 -6.57421,4.81641 -28.4375,20.59766 -14.9375,-12.70313 -12.08204,-7.58984 -18.39453,-7.19141 -10.82031,-10.08594 -4.89453,-8.19922 -7.65234,-14.82421"
svg/simpleCross.svg
View file @
b80a842a
...
...
@@ -25,19 +25,20 @@
inkscape:pageopacity=
"0.0"
inkscape:pageshadow=
"2"
inkscape:zoom=
"1.4"
inkscape:cx=
"2
12.26079
"
inkscape:cx=
"2
26.71397
"
inkscape:cy=
"876.10013"
inkscape:document-units=
"px"
inkscape:current-layer=
"layer1"
showgrid=
"false"
inkscape:object-nodes=
"true"
inkscape:object-paths=
"
tru
e"
inkscape:snap-intersection-paths=
"
tru
e"
inkscape:object-paths=
"
fals
e"
inkscape:snap-intersection-paths=
"
fals
e"
inkscape:window-width=
"1680"
inkscape:window-height=
"994"
inkscape:window-x=
"1680"
inkscape:window-y=
"27"
inkscape:window-maximized=
"1"
/>
inkscape:window-height=
"1021"
inkscape:window-x=
"0"
inkscape:window-y=
"0"
inkscape:window-maximized=
"1"
inkscape:snap-smooth-nodes=
"true"
/>
<metadata
id=
"metadata11247"
>
<rdf:RDF>
...
...
@@ -55,15 +56,15 @@
inkscape:groupmode=
"layer"
id=
"layer1"
>
<path
style=
"fill:none;stroke:#000000;stroke-width:
2
0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d=
"m
165,316.51917 c 73.41625,-38.99172 146.35598,-175.10802 217.92351,-172.24418 76.6571,3.06751 151.63468,147.3847 220.64792,172.24418
"
id=
"path
11252
"
style=
"fill:none;stroke:#000000;stroke-width:
1
0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d=
"m
382.92351,144.27499 1.3622,-208.341379
"
id=
"path
2984
"
inkscape:connector-curvature=
"0"
sodipodi:nodetypes=
"c
s
c"
/>
sodipodi:nodetypes=
"cc"
/>
<path
style=
"fill:none;stroke:#000000;stroke-width:
1
0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d=
"
m 382.89448,144.27384 1.39123,-208.340229
"
id=
"path29
84
"
style=
"fill:none;stroke:#000000;stroke-width:
2
0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d=
"
M 178.57143,305.93361 382.92351,144.27499 545.71429,295.93361
"
id=
"path29
99
"
inkscape:connector-curvature=
"0"
/>
</g>
</svg>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment