Resolve conflict

Dependencies

• [2] 6CRZBNMM Eocalon specific: x-offset map render so the edge of the map is in the ocean
• [3] DITZRHVH Run rustfmt on the native helpers
• [4] 5AMZXFS5 model trainer: function to generate inputs to pass neural network for rendering equirectangular projection
• [*] 6AXPZL5P Try to offload tight loop to rust (for now it segfaults)

Change contents

• resurrect zombie in "trainmodel/src/helpers.rs" at line 115
  [4.1018]→[2.0:69](∅→∅),[4.1018]→[2.0:69](∅→∅)
  + let xr = ((x as f64) / (width as f64) + 0.15) * 2. * PI;
• edit in trainmodel/src/helpers.rs at line 115
  [4.977]

  [2.0]
  + for x in 0..(width as usize) {
• edit in trainmodel/src/helpers.rs at line 117
  [4.977]→[3.1057:1096](∅→∅),[4.977]→[3.1057:1096](∅→∅)
  − for x in 0..(width as usize) {
• resolve order conflict in trainmodel/src/helpers.rs at line 117
  [2.69]

  [4.1078]