quickdudley/eocalon - Change E742MTJAS6KZGXIFVCZMKREGQK34LA45VBIT4E7ODBL7J64FKJFAC

Fix segfault (don't pass pointers between functions in different SDL versions), minor refactor

Created by quickdudley on July 4, 2021

E742MTJAS6KZGXIFVCZMKREGQK34LA45VBIT4E7ODBL7J64FKJFAC

Dependencies

In channels

generic

main

Change contents

File addition: .ignore (----------)
[3.13]
```
*.so
*.dylib
```
Deletion in trainmodel/src/drawmap.py at line 3 [5.13]
B:BD[4.12] → [2.252:262]
B:BD[2.262] → [2.262:263]
```
import os
```
Insertion in trainmodel/src/drawmap.py at line 7 [5.13]
[4.37]
[5.53]
```
from . import nativehelpers as helpers
```
Deletion in trainmodel/src/drawmap.py at line 10 [5.13]
B:BD[5.65] → [5.65:98]
```
# Use equirectangular projection
```

Deletion in trainmodel/src/drawmap.py at line 17 [5.13]

B:BD[6.168] → [2.264:459]

  print("rendered")
  print(image)
  print(image.contents)
  print("pixels: " + hex(image.contents.pixels))
  print(ctypes.cast(image.contents.pixels, ctypes.POINTER(ctypes.c_uint32)).contents)

Deletion in trainmodel/src/drawmap.py at line 18 [5.13]
B:BD[6.225] → [2.460:480]
```
  print("blitted")
```

Deletion in trainmodel/src/drawmap.py at line 41 [5.13]

B:BD[4.407] → [2.481:576]

B:BD[2.576] → [2.576:742]

helpers = ctypes.cdll.LoadLibrary(os.path.dirname(os.path.realpath(__file__)) + '/helpers.so')
helpers.render_tensor.argtypes = [ctypes.c_void_p, ctypes.c_int, ctypes.c_int, ctypes.c_int]
helpers.render_tensor.restype = ctypes.POINTER(sdl2.surface.SDL_Surface)

Insertion in trainmodel/src/drawmap.py at line 43 [5.13]
[6.278]
[6.460]
Replacement in trainmodel/src/helpers.rs at line 33 [2.950]
B:BD[2.1409] → [2.1409:1431]
```
#[link(name = "SDL")]
```
[2.1409]
[2.1431]
```
#[link(name = "SDL2")]
```

Deletion in trainmodel/src/helpers.rs at line 52 [2.950]

B:BD[2.2171] → [2.2171:2319]

    println!("surface: {:?}, pixels: {:?}, w: {}, h: {}", surface, unsafe { (*surface).pixels }, unsafe { (*surface).w }, unsafe { (*surface).h });

Deletion in trainmodel/src/helpers.rs at line 96 [2.950]

B:BD[2.3998] → [2.3998:4084]

    println!("Surface = {:?}, pixels = {:?}", surface, unsafe { (*surface).pixels });

File addition: nativehelpers.py (----------)

[7.6]

import ctypes
import os
import platform
import sdl2
native = ctypes.cdll.LoadLibrary(os.path.dirname(os.path.realpath(__file__)) + '/helpers.' + ('dylib' if platform.system() == 'Darwin' else 'so'))
native.render_tensor.argtypes = [ctypes.c_void_p, ctypes.c_int, ctypes.c_int, ctypes.c_int]
native.render_tensor.restype = ctypes.POINTER(sdl2.surface.SDL_Surface)
render_tensor = native.render_tensor

Replacement in trainmodel/Makefile at line 1 [8.11]

B:BD[8.11] → [2.0:27]

setup: venv src/helpers.so

[8.11]

[2.27]

ifeq ($(shell uname -s),Darwin)
  SO_SUFFIX = dylib
else
  SO_SUFFIX = so
endif
setup: venv src/helpers.$(SO_SUFFIX)

Replacement in trainmodel/Makefile at line 16 [8.11]

B:BD[2.53] → [2.53:250]

src/helpers.so: src/helpers.rs
	rustc --crate-name helpers --edition=2018 src/helpers.rs -o src/helpers.so --crate-type cdylib --emit=link -C embed-bitcode=no -C link-args="$$(sdl2-config --libs)"

[2.53]

[2.250]

src/helpers.$(SO_SUFFIX): src/helpers.rs
	rustc --crate-name helpers --edition=2018 src/helpers.rs -o src/helpers.$(SO_SUFFIX) --crate-type cdylib --emit=link -C embed-bitcode=no

Fix segfault (don't pass pointers between functions in different SDL versions), minor refactor

Dependencies

In channels

Change contents

File addition: .ignore (----------)

Deletion in trainmodel/src/drawmap.py at line 3 [5.13]

Insertion in trainmodel/src/drawmap.py at line 7 [5.13]

Deletion in trainmodel/src/drawmap.py at line 10 [5.13]