Skip to content

Commit 20f51b1

Browse files
author
arch
committed
add experimental nix shell
1 parent e480830 commit 20f51b1

3 files changed

Lines changed: 59 additions & 1 deletion

File tree

funscript_editor/config/projection.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,30 @@ vr_he_180_sbs:
3232
increase: "-"
3333
decrease: "+"
3434

35+
vr_he_180_sbs_lr:
36+
name: '3D SBS VR Video 180 L+R'
37+
video_filter: 'v360=input=he:in_stereo=sbs:pitch=${pitch}:yaw=${yaw}:roll=${roll}:out_stereo=sbs:output=flat:d_fov=${fov}:w=${width}:h=${height}'
38+
parameter:
39+
height: 800
40+
width: 800
41+
fov: 80
42+
pitch: -45
43+
yaw: 0
44+
roll: 0
45+
keys:
46+
pitch:
47+
increase: "w"
48+
decrease: "s"
49+
yaw:
50+
increase: "d"
51+
decrease: "a"
52+
roll:
53+
increase: "e"
54+
decrease: "q"
55+
fov:
56+
increase: "-"
57+
decrease: "+"
58+
3559
vr_fisheye_200_sbs:
3660
name: '3D SBS VR Video Fisheye 200'
3761
video_filter: 'v360=input=fisheye:in_stereo=sbs:id_fov=200:pitch=${pitch}:yaw=${yaw}:roll=${roll}:output=flat:d_fov=${fov}:w=${width}:h=${height}'

funscript_editor/ui/opencvui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from datetime import datetime
1010
from funscript_editor.data.ffmpegstream import FFmpegStream, VideoInfo
1111
from funscript_editor.utils.config import PROJECTION, SETTINGS, NOTIFICATION_SOUND_FILE
12-
from screeninfo import get_monitors
1312
from dataclasses import dataclass
1413

1514
import funscript_editor.utils.logging as logging
@@ -181,6 +180,7 @@ def __determine_preview_scaling(self) -> None:
181180
""" Determine the scaling for current monitor setup """
182181
scale = []
183182
try:
183+
from screeninfo import get_monitors
184184
for monitor in get_monitors():
185185
if monitor.width > monitor.height:
186186
scale.append(

shell.nix

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{ pkgs ? import <nixpkgs> {} }:
2+
let python =
3+
let
4+
packageOverrides = self:
5+
super: {
6+
opencv4 = super.opencv4.overrideAttrs (old: rec {
7+
buildInputs = old.buildInputs ++ [pkgs.qt5.full];
8+
cmakeFlags = old.cmakeFlags ++ ["-DWITH_QT=ON"];
9+
});
10+
};
11+
in
12+
pkgs.python39.override {inherit packageOverrides; self = python;};
13+
in
14+
pkgs.mkShell {
15+
nativeBuildInputs = with pkgs; [
16+
qt5.full
17+
python.pkgs.opencv4
18+
(python39.withPackages (p: with p; [
19+
coloredlogs
20+
cryptography
21+
matplotlib
22+
pillow
23+
playsound
24+
pynput
25+
pyqt5
26+
pip
27+
pyyaml
28+
scipy
29+
screeninfo
30+
mpv
31+
]))
32+
];
33+
34+
}

0 commit comments

Comments
 (0)