Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
rs-tiled
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Microhacks
rs-tiled
Commits
e02f5a61
Commit
e02f5a61
authored
10 years ago
by
Matthew Hall
Browse files
Options
Downloads
Patches
Plain Diff
Move creating EventReader to the library
Before this commit parse took an EventReader. Change so that it takes a Buffer
parent
95e1fe19
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+1
-4
1 addition, 4 deletions
README.md
examples/main.rs
+1
-6
1 addition, 6 deletions
examples/main.rs
src/lib.rs
+3
-2
3 additions, 2 deletions
src/lib.rs
with
5 additions
and
12 deletions
README.md
+
1
−
4
View file @
e02f5a61
...
@@ -9,20 +9,17 @@ Read maps from the [Tiled Map Editor](http://www.mapeditor.org/) into rust for u
...
@@ -9,20 +9,17 @@ Read maps from the [Tiled Map Editor](http://www.mapeditor.org/) into rust for u
```
rust
```
rust
extern
crate
serialize
;
extern
crate
serialize
;
extern
crate
xml
;
extern
crate
tiled
;
extern
crate
tiled
;
use
std
::
io
::
File
;
use
std
::
io
::
File
;
use
std
::
io
::
BufferedReader
;
use
std
::
io
::
BufferedReader
;
use
xml
::
reader
::
EventReader
;
use
tiled
::
parse
;
use
tiled
::
parse
;
fn
main
()
{
fn
main
()
{
let
file
=
File
::
open
(
&
Path
::
new
(
"assets/tiled_base64_zlib.tmx"
))
.unwrap
();
let
file
=
File
::
open
(
&
Path
::
new
(
"assets/tiled_base64_zlib.tmx"
))
.unwrap
();
println!
(
"Opened file"
);
println!
(
"Opened file"
);
let
reader
=
BufferedReader
::
new
(
file
);
let
reader
=
BufferedReader
::
new
(
file
);
let
mut
parser
=
EventReader
::
new
(
reader
);
let
map
=
parse
(
reader
)
.unwrap
();
let
map
=
parse
(
&
mut
parser
)
.unwrap
();
println!
(
"{}"
,
map
);
println!
(
"{}"
,
map
);
println!
(
"{}"
,
map
.get_tileset_by_gid
(
22
));
println!
(
"{}"
,
map
.get_tileset_by_gid
(
22
));
}
}
...
...
This diff is collapsed.
Click to expand it.
examples/main.rs
+
1
−
6
View file @
e02f5a61
#![feature(globs)]
extern
crate
serialize
;
extern
crate
serialize
;
extern
crate
xml
;
extern
crate
tiled
;
extern
crate
tiled
;
use
std
::
io
::
File
;
use
std
::
io
::
File
;
use
std
::
io
::
BufferedReader
;
use
std
::
io
::
BufferedReader
;
use
xml
::
reader
::
EventReader
;
use
tiled
::
parse
;
use
tiled
::
parse
;
fn
main
()
{
fn
main
()
{
let
file
=
File
::
open
(
&
Path
::
new
(
"assets/tiled_base64_zlib.tmx"
))
.unwrap
();
let
file
=
File
::
open
(
&
Path
::
new
(
"assets/tiled_base64_zlib.tmx"
))
.unwrap
();
println!
(
"Opened file"
);
println!
(
"Opened file"
);
let
reader
=
BufferedReader
::
new
(
file
);
let
reader
=
BufferedReader
::
new
(
file
);
let
mut
parser
=
EventReader
::
new
(
reader
);
let
map
=
parse
(
reader
)
.unwrap
();
let
map
=
parse
(
&
mut
parser
)
.unwrap
();
println!
(
"{}"
,
map
);
println!
(
"{}"
,
map
);
println!
(
"{}"
,
map
.get_tileset_by_gid
(
22
));
println!
(
"{}"
,
map
.get_tileset_by_gid
(
22
));
}
}
This diff is collapsed.
Click to expand it.
src/lib.rs
+
3
−
2
View file @
e02f5a61
...
@@ -449,12 +449,13 @@ fn parse_data<B: Buffer>(parser: &mut EventReader<B>, attrs: Vec<Attribute>, wid
...
@@ -449,12 +449,13 @@ fn parse_data<B: Buffer>(parser: &mut EventReader<B>, attrs: Vec<Attribute>, wid
/// Parse a buffer hopefully containing the contents of a Tiled file and try to
/// Parse a buffer hopefully containing the contents of a Tiled file and try to
/// parse it.
/// parse it.
pub
fn
parse
<
B
:
Buffer
>
(
parser
:
&
mut
EventReader
<
B
>
)
->
Result
<
Map
,
TiledError
>
{
pub
fn
parse
<
B
:
Buffer
>
(
reader
:
B
)
->
Result
<
Map
,
TiledError
>
{
let
mut
parser
=
EventReader
::
new
(
reader
);
loop
{
loop
{
match
parser
.next
()
{
match
parser
.next
()
{
StartElement
{
name
,
attributes
,
..
}
=>
{
StartElement
{
name
,
attributes
,
..
}
=>
{
if
name
.local_name
[]
==
"map"
{
if
name
.local_name
[]
==
"map"
{
return
Map
::
new
(
parser
,
attributes
);
return
Map
::
new
(
&
mut
parser
,
attributes
);
}
}
}
}
EndDocument
=>
return
Err
(
PrematureEnd
(
"Document ended before map was parsed"
.to_string
())),
EndDocument
=>
return
Err
(
PrematureEnd
(
"Document ended before map was parsed"
.to_string
())),
...
...
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