stephenseo/LD45
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: stephenseo:7fc185f614a5658fa89899711d0893891770b1ee
Branches Tags
stephenseo:master
stephenseo:devel
..
compare: stephenseo:3bb0cbf026c8a9982d5b70b258a47696f30828e7
Branches Tags
stephenseo:devel
stephenseo:master

No commits in common. "7fc185f614a5658fa89899711d0893891770b1ee" and "3bb0cbf026c8a9982d5b70b258a47696f30828e7" have entirely different histories.
7fc185f614 ... 3bb0cbf026

1 changed files with 9 additions and 15 deletions
Show stats Expand all files Collapse all files

24
src/original_impl.rs
View file

@ -1317,10 +1317,9 @@ impl Planet {
planet.color = color; planet.color = color;
idx += color_size; idx += color_size;
// No need to deserialize ParticleSystem let (psystem, psystem_size) = ParticleSystem::deserialize(data, offset + idx)?;
//let (psystem, psystem_size) = ParticleSystem::deserialize(data, offset + idx)?; planet.particle_system = psystem;
//planet.particle_system = psystem; idx += psystem_size;
//idx += psystem_size;
if data.len() < offset + idx + std::mem::size_of::<usize>() { if data.len() < offset + idx + std::mem::size_of::<usize>() {
return Err(()); return Err(());
@ -1345,9 +1344,7 @@ impl Planet {
bytes.append(&mut self.circle.serialize()); bytes.append(&mut self.circle.serialize());
bytes.append(&mut self.color.serialize()); bytes.append(&mut self.color.serialize());
bytes.append(&mut self.particle_system.serialize());
// No need to serialize ParticleSystem.
//bytes.append(&mut self.particle_system.serialize());
let moons_size = self.moons.len(); let moons_size = self.moons.len();
bytes.extend(moons_size.to_be_bytes()); bytes.extend(moons_size.to_be_bytes());
@ -1445,10 +1442,9 @@ impl Star {
star.color = color; star.color = color;
idx += color_size; idx += color_size;
// No need to deserialize ParticleSystem. let (psystem, psystem_size) = ParticleSystem::deserialize(data, offset + idx)?;
//let (psystem, psystem_size) = ParticleSystem::deserialize(data, offset + idx)?; star.particle_system = psystem;
//star.particle_system = psystem; idx += psystem_size;
//idx += psystem_size;
if data.len() < offset + idx + std::mem::size_of::<f32>() { if data.len() < offset + idx + std::mem::size_of::<f32>() {
return Err(()); return Err(());
@ -1477,9 +1473,7 @@ impl Star {
let mut bytes = Vec::new(); let mut bytes = Vec::new();
bytes.append(&mut self.color.serialize()); bytes.append(&mut self.color.serialize());
bytes.append(&mut self.particle_system.serialize());
// No need to serialize ParticleSystem.
//bytes.append(&mut self.particle_system.serialize());
bytes.extend(self.velr.to_be_bytes()); bytes.extend(self.velr.to_be_bytes());
bytes.extend(self.r.to_be_bytes()); bytes.extend(self.r.to_be_bytes());
@ -1749,7 +1743,7 @@ struct SaveData {
joining_particles: RotatingParticleSystem, joining_particles: RotatingParticleSystem,
} }
const SAVE_DATA_IDENTIFIER: [u8; 8] = [0x53, 0x41, 0x56, 0x45, 'V' as u8, 'e' as u8, 'r' as u8, 1]; const SAVE_DATA_IDENTIFIER: [u8; 4] = [0x53, 0x41, 0x56, 0x45];
impl SaveData { impl SaveData {
pub fn deserialize(data: &[u8]) -> Result<(SaveData, usize), ()> { pub fn deserialize(data: &[u8]) -> Result<(SaveData, usize), ()> {