Skip to content

Commit 1b03f02

Browse files
committed
1.6: strip repo
1 parent 6fc5416 commit 1b03f02

File tree

9 files changed

+50
-36
lines changed

9 files changed

+50
-36
lines changed

makefile renamed to Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# directory where you want to put the executable programs. By default,
1414
# both are the current directory.
1515

16-
SRC = ./
16+
SRC = ./src/
1717
BIN = ./
1818

1919
# CC should be set to the name of your favorite C compiler.
@@ -101,7 +101,7 @@ trilibrary: $(BIN)triangle.o $(BIN)tricall
101101
$(BIN)triangle: $(SRC)triangle.c
102102
$(CC) $(CSWITCHES) -o $(BIN)triangle $(SRC)triangle.c -lm
103103

104-
$(BIN)tricall: $(BIN)tricall.c $(BIN)triangle.o
104+
$(BIN)tricall: $(SRC)tricall.c $(BIN)triangle.o
105105
$(CC) $(CSWITCHES) -o $(BIN)tricall $(SRC)tricall.c \
106106
$(BIN)triangle.o -lm
107107

README

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ free, then you are not required to make any arrangement with me.)
5151
The files included in this distribution are:
5252

5353
README The file you're reading now.
54-
triangle.c Complete C source code for Triangle.
55-
showme.c Complete C source code for Show Me.
56-
triangle.h Include file for calling Triangle from another program.
57-
tricall.c Sample program that calls Triangle.
58-
makefile Makefile for compiling Triangle and Show Me.
54+
Makefile Makefile for compiling Triangle and Show Me.
55+
src/triangle.c Complete C source code for Triangle.
56+
src/showme.c Complete C source code for Show Me.
57+
src/triangle.h Include file for calling Triangle from another program.
58+
src/tricall.c Sample program that calls Triangle.
5959
A.poly A sample input file.
6060

6161
Each of Triangle and Show Me is a single portable C file. The easiest way
@@ -85,13 +85,13 @@ accordingly. You should specify:
8585
Once you've done this, type "make" to compile the programs. Alternatively,
8686
the files are usually easy to compile without a makefile:
8787

88-
cc -O -o triangle triangle.c -lm
89-
cc -O -o showme showme.c -lX11
88+
cc -O -o triangle src/triangle.c -lm
89+
cc -O -o showme src/showme.c -lX11
9090

9191
On some systems, the C compiler won't be able to find the X include files
9292
or libraries, and you'll need to specify an include path or library path:
9393

94-
cc -O -I/usr/local/include -o showme showme.c -L/usr/local/lib -lX11
94+
cc -O -I/usr/local/include -o showme src/showme.c -L/usr/local/lib -lX11
9595

9696
Some processors, including Intel x86 family and possibly Motorola 68xxx
9797
family chips, are IEEE conformant but have extended length internal

README.md

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ of some of the papers, is available from the Web page
3636

3737
These programs may be freely redistributed under the condition that the
3838
copyright notices (including the copy of this notice in the code comments
39-
and the copyright notice printed when the `-h' switch is selected) are
39+
and the copyright notice printed when the `-h` switch is selected) are
4040
not removed, and no compensation is received. Private, research, and
4141
institutional use is free. You may distribute modified versions of this
4242
code UNDER THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT
@@ -52,13 +52,13 @@ free, then you are not required to make any arrangement with me.)
5252

5353
The files included in this distribution are:
5454

55-
README The file you're reading now.
56-
triangle.c Complete C source code for Triangle.
57-
showme.c Complete C source code for Show Me.
58-
triangle.h Include file for calling Triangle from another program.
59-
tricall.c Sample program that calls Triangle.
60-
makefile Makefile for compiling Triangle and Show Me.
61-
A.poly A sample input file.
55+
* README The file you're reading now.
56+
* Makefile Makefile for compiling Triangle and Show Me.
57+
* src/triangle.c Complete C source code for Triangle.
58+
* src/showme.c Complete C source code for Show Me.
59+
* src/triangle.h Include file for calling Triangle from another program.
60+
* src/tricall.c Sample program that calls Triangle.
61+
* A.poly A sample input file.
6262

6363
Each of Triangle and Show Me is a single portable C file. The easiest way
6464
to compile them is to edit and use the included makefile. Before
@@ -87,13 +87,17 @@ accordingly. You should specify:
8787
Once you've done this, type "make" to compile the programs. Alternatively,
8888
the files are usually easy to compile without a makefile:
8989

90-
cc -O -o triangle triangle.c -lm
91-
cc -O -o showme showme.c -lX11
90+
```sh
91+
cc -O -o triangle src/triangle.c -lm
92+
cc -O -o showme src/showme.c -lX11
93+
```
9294

9395
On some systems, the C compiler won't be able to find the X include files
9496
or libraries, and you'll need to specify an include path or library path:
9597

96-
cc -O -I/usr/local/include -o showme showme.c -L/usr/local/lib -lX11
98+
```sh
99+
cc -O -I/usr/local/include -o showme src/showme.c -L/usr/local/lib -lX11
100+
```
97101

98102
Some processors, including Intel x86 family and possibly Motorola 68xxx
99103
family chips, are IEEE conformant but have extended length internal
@@ -120,21 +124,25 @@ illustrated. Find it on the Web at
120124
http://www.cs.cmu.edu/~quake/showme.html
121125

122126
Complete text instructions are printed by invoking each program with the
123-
`-h' switch:
127+
`-h` switch:
124128

129+
```sh
125130
triangle -h
126131
showme -h
132+
```
127133

128134
The instructions are long; you'll probably want to pipe the output to
129-
`more' or `lpr' or redirect it to a file.
135+
`more` or `lpr` or redirect it to a file.
130136

131137
Both programs give a short list of command line options if they are invoked
132-
without arguments (that is, just type `triangle' or `showme').
138+
without arguments (that is, just type `triangle` or `showme`).
133139

134140
Try out Triangle on the enclosed sample file, A.poly:
135141

142+
```sh
136143
triangle -p A
137144
showme A.poly &
145+
```
138146

139147
Triangle will read the Planar Straight Line Graph defined by A.poly, and
140148
write its constrained Delaunay triangulation to A.1.node and A.1.ele.
@@ -144,15 +152,19 @@ Show Me to load and display the triangulation.
144152

145153
For contrast, try running
146154

155+
```sh
147156
triangle -pq A
157+
```
148158

149159
Now, click on the same "ele" button. A new triangulation will be loaded;
150160
this one having no angles smaller than 20 degrees.
151161

152162
To see a Voronoi diagram, try this:
153163

164+
```sh
154165
cp A.poly A.node
155166
triangle -v A
167+
```
156168

157169
Click the "ele" button again. You will see the Delaunay triangulation of
158170
the points in A.poly, without the segments. Now click the top "voro" button.
@@ -162,15 +174,17 @@ Click the "Reset" button to see the full extent of the diagram.
162174
------------------------------------------------------------------------------
163175

164176
If you wish to call Triangle from another program, instructions for doing
165-
so are contained in the file `triangle.h' (but read Triangle's regular
166-
instructions first!). Also look at `tricall.c', which provides an example
177+
so are contained in the file `triangle.h` (but read Triangle's regular
178+
instructions first!). Also look at `tricall.c`, which provides an example
167179
of how to call Triangle.
168180

169181
Type "make trilibrary" to create triangle.o, a callable object file.
170182
Alternatively, the object file is usually easy to compile without a
171183
makefile:
172184

173-
cc -DTRILIBRARY -O -c triangle.c
185+
```sh
186+
cc -DTRILIBRARY -O -c src/triangle.c
187+
```
174188

175189
Type "make distclean" to remove all the object and executable files created
176190
by make.
@@ -187,13 +201,13 @@ on a list to receive email whenever a new version of Triangle is available.
187201

188202
If you use a mesh generated by Triangle or plotted by Show Me in a
189203
publication, please include an acknowledgment as well. And please spell
190-
Triangle with a capital `T'! If you want to include a citation, use
191-
`Jonathan Richard Shewchuk, ``Triangle: Engineering a 2D Quality Mesh
192-
Generator and Delaunay Triangulator,'' in Applied Computational Geometry:
204+
Triangle with a capital `T`! If you want to include a citation, use
205+
`Jonathan Richard Shewchuk, "Triangle: Engineering a 2D Quality Mesh
206+
Generator and Delaunay Triangulator," in Applied Computational Geometry:
193207
Towards Geometric Engineering (Ming C. Lin and Dinesh Manocha, editors),
194208
volume 1148 of Lecture Notes in Computer Science, pages 203-222,
195209
Springer-Verlag, Berlin, May 1996. (From the First ACM Workshop on Applied
196-
Computational Geometry.)'
210+
Computational Geometry.)`
197211

198212

199213
Jonathan Richard Shewchuk

VS2010/Triangle.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@
7474
</Link>
7575
</ItemDefinitionGroup>
7676
<ItemGroup>
77-
<ClCompile Include="..\triangle.c" />
77+
<ClCompile Include="..\src\triangle.c" />
7878
</ItemGroup>
7979
<ItemGroup>
80-
<ClInclude Include="..\triangle.h" />
80+
<ClInclude Include="..\src\triangle.h" />
8181
</ItemGroup>
8282
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
8383
<ImportGroup Label="ExtensionTargets">
8484
</ImportGroup>
85-
</Project>
85+
</Project>

VS2010/Triangle.vcxproj.filters

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="..\triangle.c">
18+
<ClCompile Include="..\src\triangle.c">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
2121
</ItemGroup>
2222
<ItemGroup>
23-
<ClInclude Include="..\triangle.h">
23+
<ClInclude Include="..\src\triangle.h">
2424
<Filter>Header Files</Filter>
2525
</ClInclude>
2626
</ItemGroup>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)