chore: follow naming conventions for functions
This commit is contained in:
parent
b0f25c9266
commit
acfe0cc478
|
@ -629,8 +629,8 @@ impl<'gc, 'a> MovieClip<'gc> {
|
||||||
TagCode::DefineShape4 => self.define_shape(context, reader, 4),
|
TagCode::DefineShape4 => self.define_shape(context, reader, 4),
|
||||||
TagCode::DefineSound => self.define_sound(context, reader, tag_len),
|
TagCode::DefineSound => self.define_sound(context, reader, tag_len),
|
||||||
TagCode::DefineSprite => self.define_sprite(context, reader, tag_len, morph_shapes),
|
TagCode::DefineSprite => self.define_sprite(context, reader, tag_len, morph_shapes),
|
||||||
TagCode::DefineText => self.define_text(context, reader),
|
TagCode::DefineText => self.define_text_1(context, reader),
|
||||||
TagCode::DefineText2 => self.define_text2(context, reader),
|
TagCode::DefineText2 => self.define_text_2(context, reader),
|
||||||
TagCode::FrameLabel => {
|
TagCode::FrameLabel => {
|
||||||
self.frame_label(context, reader, tag_len, cur_frame, &mut static_data)
|
self.frame_label(context, reader, tag_len, cur_frame, &mut static_data)
|
||||||
}
|
}
|
||||||
|
@ -1051,12 +1051,12 @@ impl<'gc, 'a> MovieClip<'gc> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn define_text(
|
fn define_text_1(
|
||||||
&mut self,
|
&mut self,
|
||||||
context: &mut UpdateContext<'_, 'gc, '_>,
|
context: &mut UpdateContext<'_, 'gc, '_>,
|
||||||
reader: &mut SwfStream<&'a [u8]>,
|
reader: &mut SwfStream<&'a [u8]>,
|
||||||
) -> DecodeResult {
|
) -> DecodeResult {
|
||||||
let text = reader.read_define_text()?;
|
let text = reader.read_define_text_1()?;
|
||||||
let text_object = Text::from_swf_tag(context, &text);
|
let text_object = Text::from_swf_tag(context, &text);
|
||||||
context
|
context
|
||||||
.library
|
.library
|
||||||
|
@ -1065,12 +1065,12 @@ impl<'gc, 'a> MovieClip<'gc> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn define_text2(
|
fn define_text_2(
|
||||||
&mut self,
|
&mut self,
|
||||||
context: &mut UpdateContext<'_, 'gc, '_>,
|
context: &mut UpdateContext<'_, 'gc, '_>,
|
||||||
reader: &mut SwfStream<&'a [u8]>,
|
reader: &mut SwfStream<&'a [u8]>,
|
||||||
) -> DecodeResult {
|
) -> DecodeResult {
|
||||||
let text = reader.read_define_text2()?;
|
let text = reader.read_define_text_2()?;
|
||||||
let text_object = Text::from_swf_tag(context, &text);
|
let text_object = Text::from_swf_tag(context, &text);
|
||||||
context
|
context
|
||||||
.library
|
.library
|
||||||
|
|
|
@ -400,8 +400,12 @@ impl<R: Read> Reader<R> {
|
||||||
Some(TagCode::DefineSound) => {
|
Some(TagCode::DefineSound) => {
|
||||||
Tag::DefineSound(Box::new(tag_reader.read_define_sound()?))
|
Tag::DefineSound(Box::new(tag_reader.read_define_sound()?))
|
||||||
}
|
}
|
||||||
Some(TagCode::DefineText) => Tag::DefineText(Box::new(tag_reader.read_define_text()?)),
|
Some(TagCode::DefineText) => {
|
||||||
Some(TagCode::DefineText2) => Tag::DefineText(Box::new(tag_reader.read_define_text2()?)),
|
Tag::DefineText(Box::new(tag_reader.read_define_text_1()?))
|
||||||
|
}
|
||||||
|
Some(TagCode::DefineText2) => {
|
||||||
|
Tag::DefineText(Box::new(tag_reader.read_define_text_2()?))
|
||||||
|
}
|
||||||
Some(TagCode::DefineVideoStream) => tag_reader.read_define_video_stream()?,
|
Some(TagCode::DefineVideoStream) => tag_reader.read_define_video_stream()?,
|
||||||
Some(TagCode::EnableTelemetry) => {
|
Some(TagCode::EnableTelemetry) => {
|
||||||
tag_reader.read_u16()?; // Reserved
|
tag_reader.read_u16()?; // Reserved
|
||||||
|
@ -2428,7 +2432,7 @@ impl<R: Read> Reader<R> {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_define_text(&mut self) -> Result<Text> {
|
pub fn read_define_text_1(&mut self) -> Result<Text> {
|
||||||
let id = self.read_character_id()?;
|
let id = self.read_character_id()?;
|
||||||
let bounds = self.read_rectangle()?;
|
let bounds = self.read_rectangle()?;
|
||||||
let matrix = self.read_matrix()?;
|
let matrix = self.read_matrix()?;
|
||||||
|
@ -2436,7 +2440,7 @@ impl<R: Read> Reader<R> {
|
||||||
let num_advance_bits = self.read_u8()?;
|
let num_advance_bits = self.read_u8()?;
|
||||||
|
|
||||||
let mut records = vec![];
|
let mut records = vec![];
|
||||||
while let Some(record) = self.read_text_record(num_glyph_bits, num_advance_bits)? {
|
while let Some(record) = self.read_text_record_1(num_glyph_bits, num_advance_bits)? {
|
||||||
records.push(record);
|
records.push(record);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2448,7 +2452,7 @@ impl<R: Read> Reader<R> {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_define_text2(&mut self) -> Result<Text> {
|
pub fn read_define_text_2(&mut self) -> Result<Text> {
|
||||||
let id = self.read_character_id()?;
|
let id = self.read_character_id()?;
|
||||||
let bounds = self.read_rectangle()?;
|
let bounds = self.read_rectangle()?;
|
||||||
let matrix = self.read_matrix()?;
|
let matrix = self.read_matrix()?;
|
||||||
|
@ -2456,7 +2460,7 @@ impl<R: Read> Reader<R> {
|
||||||
let num_advance_bits = self.read_u8()?;
|
let num_advance_bits = self.read_u8()?;
|
||||||
|
|
||||||
let mut records = vec![];
|
let mut records = vec![];
|
||||||
while let Some(record) = self.read_text_record2(num_glyph_bits, num_advance_bits)? {
|
while let Some(record) = self.read_text_record_2(num_glyph_bits, num_advance_bits)? {
|
||||||
records.push(record);
|
records.push(record);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2468,7 +2472,7 @@ impl<R: Read> Reader<R> {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_text_record(
|
fn read_text_record_1(
|
||||||
&mut self,
|
&mut self,
|
||||||
num_glyph_bits: u8,
|
num_glyph_bits: u8,
|
||||||
num_advance_bits: u8,
|
num_advance_bits: u8,
|
||||||
|
@ -2525,7 +2529,7 @@ impl<R: Read> Reader<R> {
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_text_record2(
|
fn read_text_record_2(
|
||||||
&mut self,
|
&mut self,
|
||||||
num_glyph_bits: u8,
|
num_glyph_bits: u8,
|
||||||
num_advance_bits: u8,
|
num_advance_bits: u8,
|
||||||
|
|
Loading…
Reference in New Issue