[Scummvm-git-logs] scummvm master -> 070820f9b8899bbbb293ebcabf3337ae12c26763

sev- noreply at scummvm.org
Sat Jan 25 16:47:12 UTC 2025


This automated email contains information about 10 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7e0d8c3450 DEVTOOLS: Added QTVR cursors to macgui.dat, adjusted create_macgui.sh sctipt accordingly
ea09937231 DISTS: Regenerated macgui.dat file
32e690c30f VIDEO: Show default cursor for object QTVRs
5a1fada737 TESTBED: Pass relative coordinates to QuickTime movie
b22892b71d VIDEO: Update object cursors depending on the action
5123119dbd VIDEO: Move QTVR-related variables to QuickTimeDecoder class
464e6f55d0 VIDEO: Compute tilt and pan angles for QTVR object movies
35c3e69fee VIDEO: Implement navigation cursor logic for object QTVRs
935313cc3c TESTBED: Fix mouse up processing for QTVR videos
070820f9b8 VIDEO: Implement hotzones for QTVR objects, fix cursors


Commit: 7e0d8c34503cedb7c3c86a76c826b04af20c6de1
    https://github.com/scummvm/scummvm/commit/7e0d8c34503cedb7c3c86a76c826b04af20c6de1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
DEVTOOLS: Added QTVR cursors to macgui.dat, adjusted create_macgui.sh sctipt accordingly

Changed paths:
  A devtools/create_macgui/VERSION
  A devtools/create_macgui/qtvr/CURSOR128_1.cur
  A devtools/create_macgui/qtvr/CURSOR129_1.cur
  A devtools/create_macgui/qtvr/CURSOR130_1.cur
  A devtools/create_macgui/qtvr/CURSOR131_1.cur
  A devtools/create_macgui/qtvr/CURSOR132_1.cur
  A devtools/create_macgui/qtvr/CURSOR133_1.cur
  A devtools/create_macgui/qtvr/CURSOR134_1.cur
  A devtools/create_macgui/qtvr/CURSOR135_1.cur
  A devtools/create_macgui/qtvr/CURSOR136_1.cur
  A devtools/create_macgui/qtvr/CURSOR137_1.cur
  A devtools/create_macgui/qtvr/CURSOR138_1.cur
  A devtools/create_macgui/qtvr/CURSOR139_1.cur
  A devtools/create_macgui/qtvr/CURSOR140_1.cur
  A devtools/create_macgui/qtvr/CURSOR141_1.cur
  A devtools/create_macgui/qtvr/CURSOR142_1.cur
  A devtools/create_macgui/qtvr/CURSOR143_1.cur
  A devtools/create_macgui/qtvr/CURSOR144_1.cur
  A devtools/create_macgui/qtvr/CURSOR145_1.cur
  A devtools/create_macgui/qtvr/CURSOR146_1.cur
  A devtools/create_macgui/qtvr/CURSOR147_1.cur
  A devtools/create_macgui/qtvr/CURSOR148_1.cur
  A devtools/create_macgui/qtvr/CURSOR149_1.cur
  A devtools/create_macgui/qtvr/CURSOR150_1.cur
  A devtools/create_macgui/qtvr/CURSOR151_1.cur
  A devtools/create_macgui/qtvr/CURSOR152_1.cur
  A devtools/create_macgui/qtvr/CURSOR153_1.cur
  A devtools/create_macgui/qtvr/CURSOR154_1.cur
  A devtools/create_macgui/qtvr/CURSOR155_1.cur
  A devtools/create_macgui/qtvr/CURSOR156_1.cur
  A devtools/create_macgui/qtvr/CURSOR157_1.cur
  A devtools/create_macgui/qtvr/CURSOR158_1.cur
  A devtools/create_macgui/qtvr/CURSOR159_1.cur
  A devtools/create_macgui/qtvr/CURSOR160_1.cur
  A devtools/create_macgui/qtvr/CURSOR161_1.cur
  A devtools/create_macgui/qtvr/CURSOR162_1.cur
  A devtools/create_macgui/qtvr/CURSOR163_1.cur
  A devtools/create_macgui/qtvr/CURSOR164_1.cur
  A devtools/create_macgui/qtvr/CURSOR165_1.cur
  A devtools/create_macgui/qtvr/CURSOR166_1.cur
  A devtools/create_macgui/qtvr/CURSOR167_1.cur
  A devtools/create_macgui/qtvr/CURSOR168_1.cur
  A devtools/create_macgui/qtvr/CURSOR169_1.cur
  A devtools/create_macgui/qtvr/CURSOR170_1.cur
  A devtools/create_macgui/qtvr/CURSOR171_1.cur
  A devtools/create_macgui/qtvr/CURSOR172_1.cur
  A devtools/create_macgui/qtvr/CURSOR173_1.cur
  A devtools/create_macgui/qtvr/CURSOR174_1.cur
  A devtools/create_macgui/qtvr/CURSOR175_1.cur
  A devtools/create_macgui/qtvr/CURSOR176_1.cur
  A devtools/create_macgui/qtvr/CURSOR177_1.cur
  A devtools/create_macgui/qtvr/CURSOR178_1.cur
  A devtools/create_macgui/qtvr/CURSOR179_1.cur
  A devtools/create_macgui/qtvr/CURSOR180_1.cur
  A devtools/create_macgui/qtvr/CURSOR181_1.cur
  A devtools/create_macgui/qtvr/CURSOR182_1.cur
  A devtools/create_macgui/qtvr/CURSOR183_1.cur
  A devtools/create_macgui/qtvr/CURSOR184_1.cur
  A devtools/create_macgui/qtvr/CURSOR185_1.cur
  A devtools/create_macgui/qtvr/CURSOR186_1.cur
  A devtools/create_macgui/qtvr/CURSOR187_1.cur
  A devtools/create_macgui/qtvr/CURSOR188_1.cur
  A devtools/create_macgui/qtvr/CURSOR189_1.cur
  A devtools/create_macgui/qtvr/CURSOR190_1.cur
  A devtools/create_macgui/qtvr/CURSOR191_1.cur
  A devtools/create_macgui/qtvr/CURSOR192_1.cur
  A devtools/create_macgui/qtvr/CURSOR193_1.cur
  A devtools/create_macgui/qtvr/CURSOR194_1.cur
  A devtools/create_macgui/qtvr/CURSOR195_1.cur
  A devtools/create_macgui/qtvr/CURSOR196_1.cur
  A devtools/create_macgui/qtvr/CURSOR197_1.cur
  A devtools/create_macgui/qtvr/CURSOR198_1.cur
  A devtools/create_macgui/qtvr/CURSOR199_1.cur
  A devtools/create_macgui/qtvr/CURSOR200_1.cur
  A devtools/create_macgui/qtvr/CURSOR201_1.cur
  A devtools/create_macgui/qtvr/CURSOR202_1.cur
  A devtools/create_macgui/qtvr/CURSOR203_1.cur
  A devtools/create_macgui/qtvr/CURSOR204_1.cur
  A devtools/create_macgui/qtvr/CURSOR205_1.cur
  A devtools/create_macgui/qtvr/CURSOR206_1.cur
  A devtools/create_macgui/qtvr/CURSOR207_1.cur
  A devtools/create_macgui/qtvr/CURSOR208_1.cur
  A devtools/create_macgui/qtvr/CURSOR209_1.cur
  A devtools/create_macgui/qtvr/CURSOR210_1.cur
  A devtools/create_macgui/qtvr/CURSOR211_1.cur
  A devtools/create_macgui/qtvr/CURSOR212_1.cur
  A devtools/create_macgui/qtvr/CURSOR213_1.cur
  A devtools/create_macgui/qtvr/CURSOR214_1.cur
  A devtools/create_macgui/qtvr/CURSOR215_1.cur
  A devtools/create_macgui/qtvr/CURSOR216_1.cur
  A devtools/create_macgui/qtvr/CURSOR217_1.cur
  A devtools/create_macgui/qtvr/CURSOR218_1.cur
  A devtools/create_macgui/qtvr/CURSOR219_1.cur
  A devtools/create_macgui/qtvr/CURSOR220_1.cur
  A devtools/create_macgui/qtvr/CURSOR221_1.cur
  A devtools/create_macgui/qtvr/CURSOR222_1.cur
  A devtools/create_macgui/qtvr/CURSOR223_1.cur
  A devtools/create_macgui/qtvr/CURSOR224_1.cur
  A devtools/create_macgui/qtvr/CURSOR225_1.cur
  A devtools/create_macgui/qtvr/CURSOR226_1.cur
  A devtools/create_macgui/qtvr/CURSOR227_1.cur
  A devtools/create_macgui/qtvr/CURSOR228_1.cur
  A devtools/create_macgui/qtvr/CURSOR480_1.cur
  A devtools/create_macgui/qtvr/CURSOR481_1.cur
  A devtools/create_macgui/qtvr/CURSOR482_1.cur
  A devtools/create_macgui/qtvr/CURSOR483_1.cur
  A devtools/create_macgui/qtvr/CURSOR484_1.cur
  A devtools/create_macgui/qtvr/CURSOR485_1.cur
  A devtools/create_macgui/qtvr/CURSOR486_1.cur
  A devtools/create_macgui/qtvr/CURSOR487_1.cur
  A devtools/create_macgui/qtvr/CURSOR488_1.cur
  A devtools/create_macgui/qtvr/CURSOR489_1.cur
  A devtools/create_macgui/qtvr/CURSOR490_1.cur
  A devtools/create_macgui/qtvr/CURSOR491_1.cur
  A devtools/create_macgui/qtvr/CURSOR492_1.cur
  A devtools/create_macgui/qtvr/CURSOR493_1.cur
  A devtools/create_macgui/qtvr/CURSOR494_1.cur
  A devtools/create_macgui/qtvr/CURSOR495_1.cur
  A devtools/create_macgui/qtvr/CURSOR500_1.cur
  A devtools/create_macgui/qtvr/CURSOR501_1.cur
  A devtools/create_macgui/qtvr/CURSOR502_1.cur
  A devtools/create_macgui/qtvr/CURSOR503_1.cur
  A devtools/create_macgui/qtvr/CURSOR504_1.cur
  A devtools/create_macgui/qtvr/CURSOR505_1.cur
  A devtools/create_macgui/qtvr/CURSOR506_1.cur
  A devtools/create_macgui/qtvr/CURSOR507_1.cur
  A devtools/create_macgui/qtvr/CURSOR508_1.cur
  A devtools/create_macgui/qtvr/CURSOR509_1.cur
  A devtools/create_macgui/qtvr/CURSOR510_1.cur
  A devtools/create_macgui/qtvr/CURSOR511_1.cur
  A devtools/create_macgui/qtvr/CURSOR512_1.cur
  A devtools/create_macgui/qtvr/CURSOR513_1.cur
  A devtools/create_macgui/qtvr/CURSOR514_1.cur
  A devtools/create_macgui/qtvr/CURSOR515_1.cur
  A devtools/create_macgui/qtvr/CURSOR516_1.cur
  A devtools/create_macgui/qtvr/CURSOR517_1.cur
  A devtools/create_macgui/qtvr/CURSOR518_1.cur
  A devtools/create_macgui/qtvr/CURSOR519_1.cur
  A devtools/create_macgui/qtvr/CURSOR520_1.cur
  A devtools/create_macgui/qtvr/CURSOR521_1.cur
  A devtools/create_macgui/qtvr/CURSOR522_1.cur
  A devtools/create_macgui/qtvr/CURSOR523_1.cur
  A devtools/create_macgui/qtvr/CURSOR524_1.cur
  A devtools/create_macgui/qtvr/CURSOR525_1.cur
  A devtools/create_macgui/qtvr/CURSOR526_1.cur
  A devtools/create_macgui/qtvr/CURSOR527_1.cur
  A devtools/create_macgui/qtvr/CURSOR528_1.cur
  A devtools/create_macgui/qtvr/CURSOR529_1.cur
  A devtools/create_macgui/qtvr/CURSOR530_1.cur
  A devtools/create_macgui/qtvr/CURSOR531_1.cur
  A devtools/create_macgui/qtvr/CURSOR532_1.cur
  A devtools/create_macgui/qtvr/CURSOR533_1.cur
  A devtools/create_macgui/qtvr/CURSOR534_1.cur
  A devtools/create_macgui/qtvr/CURSOR540_1.cur
  A devtools/create_macgui/qtvr/CURSOR541_1.cur
  A devtools/create_macgui/qtvr/CURSOR542_1.cur
  A devtools/create_macgui/qtvr/CURSOR543_1.cur
  A devtools/create_macgui/qtvr/CURSOR544_1.cur
  A devtools/create_macgui/qtvr/CURSOR545_1.cur
  A devtools/create_macgui/qtvr/CURSOR546_1.cur
  A devtools/create_macgui/qtvr/CURSOR547_1.cur
  A devtools/create_macgui/qtvr/CURSOR548_1.cur
  A devtools/create_macgui/qtvr/CURSOR549_1.cur
  A devtools/create_macgui/qtvr/CURSOR550_1.cur
  A devtools/create_macgui/qtvr/CURSOR551_1.cur
  A devtools/create_macgui/qtvr/CURSOR552_1.cur
  A devtools/create_macgui/qtvr/CURSOR553_1.cur
  A devtools/create_macgui/qtvr/CURSOR554_1.cur
  A devtools/create_macgui/qtvr/CURSOR555_1.cur
  A devtools/create_macgui/qtvr/CURSOR556_1.cur
  A devtools/create_macgui/qtvr/CURSOR557_1.cur
  A devtools/create_macgui/qtvr/CURSOR558_1.cur
  A devtools/create_macgui/qtvr/CURSOR559_1.cur
  A devtools/create_macgui/qtvr/CURSOR560_1.cur
  A devtools/create_macgui/qtvr/CURSOR561_1.cur
  A devtools/create_macgui/qtvr/CURSOR562_1.cur
  A devtools/create_macgui/qtvr/CURSOR563_1.cur
  A devtools/create_macgui/qtvr/CURSOR564_1.cur
    devtools/create_macgui/create_macgui.sh


diff --git a/devtools/create_macgui/VERSION b/devtools/create_macgui/VERSION
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/devtools/create_macgui/VERSION
@@ -0,0 +1 @@
+1
diff --git a/devtools/create_macgui/create_macgui.sh b/devtools/create_macgui/create_macgui.sh
index 9fe54b48e3f..e48241186b2 100755
--- a/devtools/create_macgui/create_macgui.sh
+++ b/devtools/create_macgui/create_macgui.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-printf "Creating border file...\n"
+printf "Creating MacGUI file...\n"
 
-zip -r macgui.zip *.bmp
+zip -r macgui.zip VERSION *.bmp qtvr
 mv macgui.zip macgui.dat
 
 echo done
diff --git a/devtools/create_macgui/qtvr/CURSOR128_1.cur b/devtools/create_macgui/qtvr/CURSOR128_1.cur
new file mode 100644
index 00000000000..225566bf383
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR128_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR129_1.cur b/devtools/create_macgui/qtvr/CURSOR129_1.cur
new file mode 100644
index 00000000000..b45f809df76
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR129_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR130_1.cur b/devtools/create_macgui/qtvr/CURSOR130_1.cur
new file mode 100644
index 00000000000..a0761d03bc2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR130_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR131_1.cur b/devtools/create_macgui/qtvr/CURSOR131_1.cur
new file mode 100644
index 00000000000..edddb5b0f71
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR131_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR132_1.cur b/devtools/create_macgui/qtvr/CURSOR132_1.cur
new file mode 100644
index 00000000000..b033d1bdf7f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR132_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR133_1.cur b/devtools/create_macgui/qtvr/CURSOR133_1.cur
new file mode 100644
index 00000000000..f5c073dc35c
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR133_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR134_1.cur b/devtools/create_macgui/qtvr/CURSOR134_1.cur
new file mode 100644
index 00000000000..8416fbf02c7
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR134_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR135_1.cur b/devtools/create_macgui/qtvr/CURSOR135_1.cur
new file mode 100644
index 00000000000..b720928d21d
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR135_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR136_1.cur b/devtools/create_macgui/qtvr/CURSOR136_1.cur
new file mode 100644
index 00000000000..2191a5af3de
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR136_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR137_1.cur b/devtools/create_macgui/qtvr/CURSOR137_1.cur
new file mode 100644
index 00000000000..3557cf0eb85
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR137_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR138_1.cur b/devtools/create_macgui/qtvr/CURSOR138_1.cur
new file mode 100644
index 00000000000..71dcd8c269d
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR138_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR139_1.cur b/devtools/create_macgui/qtvr/CURSOR139_1.cur
new file mode 100644
index 00000000000..53d3b30884a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR139_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR140_1.cur b/devtools/create_macgui/qtvr/CURSOR140_1.cur
new file mode 100644
index 00000000000..c8e23f58c93
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR140_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR141_1.cur b/devtools/create_macgui/qtvr/CURSOR141_1.cur
new file mode 100644
index 00000000000..b071aa8494a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR141_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR142_1.cur b/devtools/create_macgui/qtvr/CURSOR142_1.cur
new file mode 100644
index 00000000000..a21f5bbaa5a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR142_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR143_1.cur b/devtools/create_macgui/qtvr/CURSOR143_1.cur
new file mode 100644
index 00000000000..c1e1a8e15f4
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR143_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR144_1.cur b/devtools/create_macgui/qtvr/CURSOR144_1.cur
new file mode 100644
index 00000000000..1663ef29763
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR144_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR145_1.cur b/devtools/create_macgui/qtvr/CURSOR145_1.cur
new file mode 100644
index 00000000000..5d952d83a85
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR145_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR146_1.cur b/devtools/create_macgui/qtvr/CURSOR146_1.cur
new file mode 100644
index 00000000000..1fe668ec524
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR146_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR147_1.cur b/devtools/create_macgui/qtvr/CURSOR147_1.cur
new file mode 100644
index 00000000000..0cca821b16c
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR147_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR148_1.cur b/devtools/create_macgui/qtvr/CURSOR148_1.cur
new file mode 100644
index 00000000000..70f9b483ce3
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR148_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR149_1.cur b/devtools/create_macgui/qtvr/CURSOR149_1.cur
new file mode 100644
index 00000000000..a5359726676
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR149_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR150_1.cur b/devtools/create_macgui/qtvr/CURSOR150_1.cur
new file mode 100644
index 00000000000..78e093ea674
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR150_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR151_1.cur b/devtools/create_macgui/qtvr/CURSOR151_1.cur
new file mode 100644
index 00000000000..c418509eb35
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR151_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR152_1.cur b/devtools/create_macgui/qtvr/CURSOR152_1.cur
new file mode 100644
index 00000000000..1c7c0c57f6f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR152_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR153_1.cur b/devtools/create_macgui/qtvr/CURSOR153_1.cur
new file mode 100644
index 00000000000..901de813758
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR153_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR154_1.cur b/devtools/create_macgui/qtvr/CURSOR154_1.cur
new file mode 100644
index 00000000000..07bb2a0a2ea
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR154_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR155_1.cur b/devtools/create_macgui/qtvr/CURSOR155_1.cur
new file mode 100644
index 00000000000..01b5f642fb0
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR155_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR156_1.cur b/devtools/create_macgui/qtvr/CURSOR156_1.cur
new file mode 100644
index 00000000000..2cddd97257a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR156_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR157_1.cur b/devtools/create_macgui/qtvr/CURSOR157_1.cur
new file mode 100644
index 00000000000..853bcdbd63d
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR157_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR158_1.cur b/devtools/create_macgui/qtvr/CURSOR158_1.cur
new file mode 100644
index 00000000000..a3ba382be3e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR158_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR159_1.cur b/devtools/create_macgui/qtvr/CURSOR159_1.cur
new file mode 100644
index 00000000000..f435fbdc4e5
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR159_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR160_1.cur b/devtools/create_macgui/qtvr/CURSOR160_1.cur
new file mode 100644
index 00000000000..aade7e1b056
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR160_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR161_1.cur b/devtools/create_macgui/qtvr/CURSOR161_1.cur
new file mode 100644
index 00000000000..fac379b6660
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR161_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR162_1.cur b/devtools/create_macgui/qtvr/CURSOR162_1.cur
new file mode 100644
index 00000000000..02149470b4a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR162_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR163_1.cur b/devtools/create_macgui/qtvr/CURSOR163_1.cur
new file mode 100644
index 00000000000..ca36f983442
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR163_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR164_1.cur b/devtools/create_macgui/qtvr/CURSOR164_1.cur
new file mode 100644
index 00000000000..5ca9f96fa68
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR164_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR165_1.cur b/devtools/create_macgui/qtvr/CURSOR165_1.cur
new file mode 100644
index 00000000000..9c2a36effea
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR165_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR166_1.cur b/devtools/create_macgui/qtvr/CURSOR166_1.cur
new file mode 100644
index 00000000000..266473435a0
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR166_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR167_1.cur b/devtools/create_macgui/qtvr/CURSOR167_1.cur
new file mode 100644
index 00000000000..6a26654b129
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR167_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR168_1.cur b/devtools/create_macgui/qtvr/CURSOR168_1.cur
new file mode 100644
index 00000000000..d495572dfcf
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR168_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR169_1.cur b/devtools/create_macgui/qtvr/CURSOR169_1.cur
new file mode 100644
index 00000000000..a8267fb9e6c
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR169_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR170_1.cur b/devtools/create_macgui/qtvr/CURSOR170_1.cur
new file mode 100644
index 00000000000..4bdf84cacca
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR170_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR171_1.cur b/devtools/create_macgui/qtvr/CURSOR171_1.cur
new file mode 100644
index 00000000000..c3de3cff87f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR171_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR172_1.cur b/devtools/create_macgui/qtvr/CURSOR172_1.cur
new file mode 100644
index 00000000000..b40e9e674f3
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR172_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR173_1.cur b/devtools/create_macgui/qtvr/CURSOR173_1.cur
new file mode 100644
index 00000000000..c8f3add6048
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR173_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR174_1.cur b/devtools/create_macgui/qtvr/CURSOR174_1.cur
new file mode 100644
index 00000000000..543545af6b1
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR174_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR175_1.cur b/devtools/create_macgui/qtvr/CURSOR175_1.cur
new file mode 100644
index 00000000000..7239a9798fc
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR175_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR176_1.cur b/devtools/create_macgui/qtvr/CURSOR176_1.cur
new file mode 100644
index 00000000000..e50714b85fa
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR176_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR177_1.cur b/devtools/create_macgui/qtvr/CURSOR177_1.cur
new file mode 100644
index 00000000000..dc6a2fd9951
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR177_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR178_1.cur b/devtools/create_macgui/qtvr/CURSOR178_1.cur
new file mode 100644
index 00000000000..9720a543a0f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR178_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR179_1.cur b/devtools/create_macgui/qtvr/CURSOR179_1.cur
new file mode 100644
index 00000000000..5442a9ea66e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR179_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR180_1.cur b/devtools/create_macgui/qtvr/CURSOR180_1.cur
new file mode 100644
index 00000000000..4b99c84c722
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR180_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR181_1.cur b/devtools/create_macgui/qtvr/CURSOR181_1.cur
new file mode 100644
index 00000000000..027574284e7
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR181_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR182_1.cur b/devtools/create_macgui/qtvr/CURSOR182_1.cur
new file mode 100644
index 00000000000..f3c01d01692
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR182_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR183_1.cur b/devtools/create_macgui/qtvr/CURSOR183_1.cur
new file mode 100644
index 00000000000..8d7d06fb33a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR183_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR184_1.cur b/devtools/create_macgui/qtvr/CURSOR184_1.cur
new file mode 100644
index 00000000000..c8ab37e20f5
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR184_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR185_1.cur b/devtools/create_macgui/qtvr/CURSOR185_1.cur
new file mode 100644
index 00000000000..0dfd8181fed
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR185_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR186_1.cur b/devtools/create_macgui/qtvr/CURSOR186_1.cur
new file mode 100644
index 00000000000..c204cef525a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR186_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR187_1.cur b/devtools/create_macgui/qtvr/CURSOR187_1.cur
new file mode 100644
index 00000000000..dcce2783608
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR187_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR188_1.cur b/devtools/create_macgui/qtvr/CURSOR188_1.cur
new file mode 100644
index 00000000000..d8251970ad5
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR188_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR189_1.cur b/devtools/create_macgui/qtvr/CURSOR189_1.cur
new file mode 100644
index 00000000000..8a802f6277e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR189_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR190_1.cur b/devtools/create_macgui/qtvr/CURSOR190_1.cur
new file mode 100644
index 00000000000..435b1e79658
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR190_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR191_1.cur b/devtools/create_macgui/qtvr/CURSOR191_1.cur
new file mode 100644
index 00000000000..8a647490e66
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR191_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR192_1.cur b/devtools/create_macgui/qtvr/CURSOR192_1.cur
new file mode 100644
index 00000000000..15c1396f060
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR192_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR193_1.cur b/devtools/create_macgui/qtvr/CURSOR193_1.cur
new file mode 100644
index 00000000000..a2e3e0c8917
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR193_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR194_1.cur b/devtools/create_macgui/qtvr/CURSOR194_1.cur
new file mode 100644
index 00000000000..d5021bdd34c
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR194_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR195_1.cur b/devtools/create_macgui/qtvr/CURSOR195_1.cur
new file mode 100644
index 00000000000..dc8b39adc9f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR195_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR196_1.cur b/devtools/create_macgui/qtvr/CURSOR196_1.cur
new file mode 100644
index 00000000000..29e23ee912d
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR196_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR197_1.cur b/devtools/create_macgui/qtvr/CURSOR197_1.cur
new file mode 100644
index 00000000000..1ae3f19697e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR197_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR198_1.cur b/devtools/create_macgui/qtvr/CURSOR198_1.cur
new file mode 100644
index 00000000000..b0d9fe5b615
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR198_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR199_1.cur b/devtools/create_macgui/qtvr/CURSOR199_1.cur
new file mode 100644
index 00000000000..641f44a1f2c
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR199_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR200_1.cur b/devtools/create_macgui/qtvr/CURSOR200_1.cur
new file mode 100644
index 00000000000..37d02f2e7bf
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR200_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR201_1.cur b/devtools/create_macgui/qtvr/CURSOR201_1.cur
new file mode 100644
index 00000000000..9893b3a2f29
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR201_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR202_1.cur b/devtools/create_macgui/qtvr/CURSOR202_1.cur
new file mode 100644
index 00000000000..0953317875c
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR202_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR203_1.cur b/devtools/create_macgui/qtvr/CURSOR203_1.cur
new file mode 100644
index 00000000000..57e6d5812ea
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR203_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR204_1.cur b/devtools/create_macgui/qtvr/CURSOR204_1.cur
new file mode 100644
index 00000000000..33dfff87b28
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR204_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR205_1.cur b/devtools/create_macgui/qtvr/CURSOR205_1.cur
new file mode 100644
index 00000000000..cfddf5852a3
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR205_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR206_1.cur b/devtools/create_macgui/qtvr/CURSOR206_1.cur
new file mode 100644
index 00000000000..b4af839a91f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR206_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR207_1.cur b/devtools/create_macgui/qtvr/CURSOR207_1.cur
new file mode 100644
index 00000000000..da78c7b64ec
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR207_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR208_1.cur b/devtools/create_macgui/qtvr/CURSOR208_1.cur
new file mode 100644
index 00000000000..64594935943
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR208_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR209_1.cur b/devtools/create_macgui/qtvr/CURSOR209_1.cur
new file mode 100644
index 00000000000..cb831886e40
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR209_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR210_1.cur b/devtools/create_macgui/qtvr/CURSOR210_1.cur
new file mode 100644
index 00000000000..5de7b2aa2ab
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR210_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR211_1.cur b/devtools/create_macgui/qtvr/CURSOR211_1.cur
new file mode 100644
index 00000000000..fc9255447a1
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR211_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR212_1.cur b/devtools/create_macgui/qtvr/CURSOR212_1.cur
new file mode 100644
index 00000000000..bdd72b7fdec
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR212_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR213_1.cur b/devtools/create_macgui/qtvr/CURSOR213_1.cur
new file mode 100644
index 00000000000..899b446bdab
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR213_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR214_1.cur b/devtools/create_macgui/qtvr/CURSOR214_1.cur
new file mode 100644
index 00000000000..bbfb4a74cf9
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR214_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR215_1.cur b/devtools/create_macgui/qtvr/CURSOR215_1.cur
new file mode 100644
index 00000000000..6bc6a16aca1
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR215_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR216_1.cur b/devtools/create_macgui/qtvr/CURSOR216_1.cur
new file mode 100644
index 00000000000..bbc88f29bca
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR216_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR217_1.cur b/devtools/create_macgui/qtvr/CURSOR217_1.cur
new file mode 100644
index 00000000000..2a2d08e8044
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR217_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR218_1.cur b/devtools/create_macgui/qtvr/CURSOR218_1.cur
new file mode 100644
index 00000000000..57531365717
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR218_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR219_1.cur b/devtools/create_macgui/qtvr/CURSOR219_1.cur
new file mode 100644
index 00000000000..bbb1f4614c2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR219_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR220_1.cur b/devtools/create_macgui/qtvr/CURSOR220_1.cur
new file mode 100644
index 00000000000..be810cdaf5e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR220_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR221_1.cur b/devtools/create_macgui/qtvr/CURSOR221_1.cur
new file mode 100644
index 00000000000..feed3309c3f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR221_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR222_1.cur b/devtools/create_macgui/qtvr/CURSOR222_1.cur
new file mode 100644
index 00000000000..b6a4aea634e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR222_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR223_1.cur b/devtools/create_macgui/qtvr/CURSOR223_1.cur
new file mode 100644
index 00000000000..dd9fd4892ff
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR223_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR224_1.cur b/devtools/create_macgui/qtvr/CURSOR224_1.cur
new file mode 100644
index 00000000000..84835c8936b
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR224_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR225_1.cur b/devtools/create_macgui/qtvr/CURSOR225_1.cur
new file mode 100644
index 00000000000..37fbee7c483
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR225_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR226_1.cur b/devtools/create_macgui/qtvr/CURSOR226_1.cur
new file mode 100644
index 00000000000..2c5ce2f8ee6
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR226_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR227_1.cur b/devtools/create_macgui/qtvr/CURSOR227_1.cur
new file mode 100644
index 00000000000..e7c18da36d3
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR227_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR228_1.cur b/devtools/create_macgui/qtvr/CURSOR228_1.cur
new file mode 100644
index 00000000000..ede432f2f74
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR228_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR480_1.cur b/devtools/create_macgui/qtvr/CURSOR480_1.cur
new file mode 100644
index 00000000000..486350ff4c6
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR480_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR481_1.cur b/devtools/create_macgui/qtvr/CURSOR481_1.cur
new file mode 100644
index 00000000000..f2b486f3706
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR481_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR482_1.cur b/devtools/create_macgui/qtvr/CURSOR482_1.cur
new file mode 100644
index 00000000000..bf5ebbb0ea2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR482_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR483_1.cur b/devtools/create_macgui/qtvr/CURSOR483_1.cur
new file mode 100644
index 00000000000..bf5ebbb0ea2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR483_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR484_1.cur b/devtools/create_macgui/qtvr/CURSOR484_1.cur
new file mode 100644
index 00000000000..c8fe242ef4e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR484_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR485_1.cur b/devtools/create_macgui/qtvr/CURSOR485_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR485_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR486_1.cur b/devtools/create_macgui/qtvr/CURSOR486_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR486_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR487_1.cur b/devtools/create_macgui/qtvr/CURSOR487_1.cur
new file mode 100644
index 00000000000..c8fe242ef4e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR487_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR488_1.cur b/devtools/create_macgui/qtvr/CURSOR488_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR488_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR489_1.cur b/devtools/create_macgui/qtvr/CURSOR489_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR489_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR490_1.cur b/devtools/create_macgui/qtvr/CURSOR490_1.cur
new file mode 100644
index 00000000000..c8fe242ef4e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR490_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR491_1.cur b/devtools/create_macgui/qtvr/CURSOR491_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR491_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR492_1.cur b/devtools/create_macgui/qtvr/CURSOR492_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR492_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR493_1.cur b/devtools/create_macgui/qtvr/CURSOR493_1.cur
new file mode 100644
index 00000000000..c8fe242ef4e
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR493_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR494_1.cur b/devtools/create_macgui/qtvr/CURSOR494_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR494_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR495_1.cur b/devtools/create_macgui/qtvr/CURSOR495_1.cur
new file mode 100644
index 00000000000..aa03be2e86f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR495_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR500_1.cur b/devtools/create_macgui/qtvr/CURSOR500_1.cur
new file mode 100644
index 00000000000..d84e7b4ae93
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR500_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR501_1.cur b/devtools/create_macgui/qtvr/CURSOR501_1.cur
new file mode 100644
index 00000000000..4415e31c391
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR501_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR502_1.cur b/devtools/create_macgui/qtvr/CURSOR502_1.cur
new file mode 100644
index 00000000000..bc4a3563db3
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR502_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR503_1.cur b/devtools/create_macgui/qtvr/CURSOR503_1.cur
new file mode 100644
index 00000000000..c654415c08f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR503_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR504_1.cur b/devtools/create_macgui/qtvr/CURSOR504_1.cur
new file mode 100644
index 00000000000..c654415c08f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR504_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR505_1.cur b/devtools/create_macgui/qtvr/CURSOR505_1.cur
new file mode 100644
index 00000000000..d820b0b0bc2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR505_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR506_1.cur b/devtools/create_macgui/qtvr/CURSOR506_1.cur
new file mode 100644
index 00000000000..d820b0b0bc2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR506_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR507_1.cur b/devtools/create_macgui/qtvr/CURSOR507_1.cur
new file mode 100644
index 00000000000..d820b0b0bc2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR507_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR508_1.cur b/devtools/create_macgui/qtvr/CURSOR508_1.cur
new file mode 100644
index 00000000000..c654415c08f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR508_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR509_1.cur b/devtools/create_macgui/qtvr/CURSOR509_1.cur
new file mode 100644
index 00000000000..c654415c08f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR509_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR510_1.cur b/devtools/create_macgui/qtvr/CURSOR510_1.cur
new file mode 100644
index 00000000000..05d86ff8c1f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR510_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR511_1.cur b/devtools/create_macgui/qtvr/CURSOR511_1.cur
new file mode 100644
index 00000000000..9a99bb28a69
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR511_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR512_1.cur b/devtools/create_macgui/qtvr/CURSOR512_1.cur
new file mode 100644
index 00000000000..c4bd1da8f23
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR512_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR513_1.cur b/devtools/create_macgui/qtvr/CURSOR513_1.cur
new file mode 100644
index 00000000000..f6247004076
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR513_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR514_1.cur b/devtools/create_macgui/qtvr/CURSOR514_1.cur
new file mode 100644
index 00000000000..3e94a9c54c6
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR514_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR515_1.cur b/devtools/create_macgui/qtvr/CURSOR515_1.cur
new file mode 100644
index 00000000000..66ed8cbc146
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR515_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR516_1.cur b/devtools/create_macgui/qtvr/CURSOR516_1.cur
new file mode 100644
index 00000000000..adfa22f32a3
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR516_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR517_1.cur b/devtools/create_macgui/qtvr/CURSOR517_1.cur
new file mode 100644
index 00000000000..64e4b572137
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR517_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR518_1.cur b/devtools/create_macgui/qtvr/CURSOR518_1.cur
new file mode 100644
index 00000000000..84b5c73268f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR518_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR519_1.cur b/devtools/create_macgui/qtvr/CURSOR519_1.cur
new file mode 100644
index 00000000000..2724aade3e9
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR519_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR520_1.cur b/devtools/create_macgui/qtvr/CURSOR520_1.cur
new file mode 100644
index 00000000000..45654a0e13f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR520_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR521_1.cur b/devtools/create_macgui/qtvr/CURSOR521_1.cur
new file mode 100644
index 00000000000..e58a9e74dbf
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR521_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR522_1.cur b/devtools/create_macgui/qtvr/CURSOR522_1.cur
new file mode 100644
index 00000000000..4ef61aacdd2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR522_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR523_1.cur b/devtools/create_macgui/qtvr/CURSOR523_1.cur
new file mode 100644
index 00000000000..ad6cdaa1fbc
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR523_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR524_1.cur b/devtools/create_macgui/qtvr/CURSOR524_1.cur
new file mode 100644
index 00000000000..cc86d1d0695
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR524_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR525_1.cur b/devtools/create_macgui/qtvr/CURSOR525_1.cur
new file mode 100644
index 00000000000..e5adf95e58a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR525_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR526_1.cur b/devtools/create_macgui/qtvr/CURSOR526_1.cur
new file mode 100644
index 00000000000..1c5725655fb
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR526_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR527_1.cur b/devtools/create_macgui/qtvr/CURSOR527_1.cur
new file mode 100644
index 00000000000..ed8727d4c97
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR527_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR528_1.cur b/devtools/create_macgui/qtvr/CURSOR528_1.cur
new file mode 100644
index 00000000000..a56b2a20241
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR528_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR529_1.cur b/devtools/create_macgui/qtvr/CURSOR529_1.cur
new file mode 100644
index 00000000000..7816cc302fe
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR529_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR530_1.cur b/devtools/create_macgui/qtvr/CURSOR530_1.cur
new file mode 100644
index 00000000000..e6325532640
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR530_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR531_1.cur b/devtools/create_macgui/qtvr/CURSOR531_1.cur
new file mode 100644
index 00000000000..6e3245fba0b
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR531_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR532_1.cur b/devtools/create_macgui/qtvr/CURSOR532_1.cur
new file mode 100644
index 00000000000..22e14948ef6
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR532_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR533_1.cur b/devtools/create_macgui/qtvr/CURSOR533_1.cur
new file mode 100644
index 00000000000..ab342f6e501
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR533_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR534_1.cur b/devtools/create_macgui/qtvr/CURSOR534_1.cur
new file mode 100644
index 00000000000..1f3e6a605d9
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR534_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR540_1.cur b/devtools/create_macgui/qtvr/CURSOR540_1.cur
new file mode 100644
index 00000000000..05d86ff8c1f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR540_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR541_1.cur b/devtools/create_macgui/qtvr/CURSOR541_1.cur
new file mode 100644
index 00000000000..9a99bb28a69
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR541_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR542_1.cur b/devtools/create_macgui/qtvr/CURSOR542_1.cur
new file mode 100644
index 00000000000..c4bd1da8f23
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR542_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR543_1.cur b/devtools/create_macgui/qtvr/CURSOR543_1.cur
new file mode 100644
index 00000000000..f6247004076
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR543_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR544_1.cur b/devtools/create_macgui/qtvr/CURSOR544_1.cur
new file mode 100644
index 00000000000..3e94a9c54c6
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR544_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR545_1.cur b/devtools/create_macgui/qtvr/CURSOR545_1.cur
new file mode 100644
index 00000000000..66ed8cbc146
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR545_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR546_1.cur b/devtools/create_macgui/qtvr/CURSOR546_1.cur
new file mode 100644
index 00000000000..adfa22f32a3
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR546_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR547_1.cur b/devtools/create_macgui/qtvr/CURSOR547_1.cur
new file mode 100644
index 00000000000..64e4b572137
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR547_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR548_1.cur b/devtools/create_macgui/qtvr/CURSOR548_1.cur
new file mode 100644
index 00000000000..84b5c73268f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR548_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR549_1.cur b/devtools/create_macgui/qtvr/CURSOR549_1.cur
new file mode 100644
index 00000000000..2724aade3e9
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR549_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR550_1.cur b/devtools/create_macgui/qtvr/CURSOR550_1.cur
new file mode 100644
index 00000000000..45654a0e13f
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR550_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR551_1.cur b/devtools/create_macgui/qtvr/CURSOR551_1.cur
new file mode 100644
index 00000000000..e58a9e74dbf
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR551_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR552_1.cur b/devtools/create_macgui/qtvr/CURSOR552_1.cur
new file mode 100644
index 00000000000..4ef61aacdd2
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR552_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR553_1.cur b/devtools/create_macgui/qtvr/CURSOR553_1.cur
new file mode 100644
index 00000000000..ad6cdaa1fbc
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR553_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR554_1.cur b/devtools/create_macgui/qtvr/CURSOR554_1.cur
new file mode 100644
index 00000000000..cc86d1d0695
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR554_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR555_1.cur b/devtools/create_macgui/qtvr/CURSOR555_1.cur
new file mode 100644
index 00000000000..e5adf95e58a
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR555_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR556_1.cur b/devtools/create_macgui/qtvr/CURSOR556_1.cur
new file mode 100644
index 00000000000..1c5725655fb
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR556_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR557_1.cur b/devtools/create_macgui/qtvr/CURSOR557_1.cur
new file mode 100644
index 00000000000..ed8727d4c97
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR557_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR558_1.cur b/devtools/create_macgui/qtvr/CURSOR558_1.cur
new file mode 100644
index 00000000000..a56b2a20241
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR558_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR559_1.cur b/devtools/create_macgui/qtvr/CURSOR559_1.cur
new file mode 100644
index 00000000000..7816cc302fe
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR559_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR560_1.cur b/devtools/create_macgui/qtvr/CURSOR560_1.cur
new file mode 100644
index 00000000000..e6325532640
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR560_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR561_1.cur b/devtools/create_macgui/qtvr/CURSOR561_1.cur
new file mode 100644
index 00000000000..6e3245fba0b
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR561_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR562_1.cur b/devtools/create_macgui/qtvr/CURSOR562_1.cur
new file mode 100644
index 00000000000..22e14948ef6
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR562_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR563_1.cur b/devtools/create_macgui/qtvr/CURSOR563_1.cur
new file mode 100644
index 00000000000..ab342f6e501
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR563_1.cur differ
diff --git a/devtools/create_macgui/qtvr/CURSOR564_1.cur b/devtools/create_macgui/qtvr/CURSOR564_1.cur
new file mode 100644
index 00000000000..1f3e6a605d9
Binary files /dev/null and b/devtools/create_macgui/qtvr/CURSOR564_1.cur differ


Commit: ea09937231b202f5cd73f58cd0d5f269af44b21d
    https://github.com/scummvm/scummvm/commit/ea09937231b202f5cd73f58cd0d5f269af44b21d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
DISTS: Regenerated macgui.dat file

Changed paths:
    dists/engine-data/macgui.dat


diff --git a/dists/engine-data/macgui.dat b/dists/engine-data/macgui.dat
index aa65887cabf..208004c6adc 100644
Binary files a/dists/engine-data/macgui.dat and b/dists/engine-data/macgui.dat differ


Commit: 32e690c30f9594d1aa36d5b807888adfe2c772d8
    https://github.com/scummvm/scummvm/commit/32e690c30f9594d1aa36d5b807888adfe2c772d8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
VIDEO: Show default cursor for object QTVRs

Changed paths:
    video/qt_decoder.cpp
    video/qt_decoder.h


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index eeaa07eb435..2dba61495ea 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -32,17 +32,25 @@
 
 #include "audio/audiostream.h"
 
+#include "common/archive.h"
 #include "common/debug.h"
 #include "common/memstream.h"
 #include "common/system.h"
 #include "common/textconsole.h"
 #include "common/util.h"
 
+#include "common/compression/unzip.h"
+
+#include "graphics/cursorman.h"
+#include "image/icocur.h"
+
 // Video codecs
 #include "image/codecs/codec.h"
 
 namespace Video {
 
+static const char * const MACGUI_DATA_BUNDLE = "macgui.dat";
+
 ////////////////////////////////////////////
 // QuickTimeDecoder
 ////////////////////////////////////////////
@@ -85,6 +93,10 @@ void QuickTimeDecoder::close() {
 		delete _scaledSurface;
 		_scaledSurface = 0;
 	}
+
+	delete _dataBundle;
+	_dataBundle = nullptr;
+	cleanupCursors();
 }
 
 const Graphics::Surface *QuickTimeDecoder::decodeNextFrame() {
@@ -619,8 +631,14 @@ Common::String QuickTimeDecoder::getAliasPath() {
 }
 
 void QuickTimeDecoder::handleMouseMove(int16 x, int16 y) {
-	if (_qtvrType != QTVRType::OBJECT || !_isMouseButtonDown )
+	if (_qtvrType != QTVRType::OBJECT)
+		return;
+
+	if (!_isMouseButtonDown) {
+		updateQTVRCursor(x, y);
+
 		return;
+	}
 
 	VideoTrackHandler *track = (VideoTrackHandler *)_nextVideoTrack;
 
@@ -1230,4 +1248,68 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::forceDither(const
 	return _ditherFrame;
 }
 
+enum {
+	kCurHand = 129,
+	kCurLastCursor
+};
+
+void QuickTimeDecoder::updateQTVRCursor(int16 x, int16 y) {
+	if (_qtvrType == QTVRType::OBJECT)
+		setCursor(kCurHand);
+}
+
+void QuickTimeDecoder::cleanupCursors() {
+	if (!_cursorCache)
+		return;
+
+	for (int i = 0; i < kCurLastCursor; i++)
+		delete _cursorCache[i];
+
+	delete _cursorCache;
+	_cursorCache = nullptr;
+}
+
+void QuickTimeDecoder::setCursor(int curId) {
+	if (_currentQTVRCursor == curId)
+		return;
+
+	_currentQTVRCursor = curId;
+
+	if (!_dataBundle) {
+		_dataBundle = Common::makeZipArchive(MACGUI_DATA_BUNDLE);
+
+		if (!_dataBundle) {
+			warning("QTVR: Couldn't load data bundle '%s'.", MACGUI_DATA_BUNDLE);
+		}
+	}
+
+	if (!_cursorCache)
+		_cursorCache = (Graphics::Cursor **)calloc(kCurLastCursor, sizeof(Graphics::Cursor *));
+
+	if (curId >= kCurLastCursor)
+		error("QTVR: Incorrect cursor ID: %d > %d", curId, kCurLastCursor);
+
+	if (!_cursorCache[curId]) {
+		Common::Path path(Common::String::format("qtvr/CURSOR%d_1.cur", curId));
+
+		Common::SeekableReadStream *stream = _dataBundle->createReadStreamForMember(path);
+
+		if (!stream) {
+			warning("QTVR: Cannot load cursor ID %d, file '%s' does not exist", curId, path.toString().c_str());
+			return;
+		}
+
+		Image::IcoCurDecoder decoder;
+		if (!decoder.open(*stream, DisposeAfterUse::YES)) {
+			warning("QTVR: Cannot load cursor ID %d, file '%s' bad format", curId, path.toString().c_str());
+			return;
+		}
+
+		_cursorCache[curId] = decoder.loadItemAsCursor(0);
+	}
+
+	CursorMan.replaceCursor(_cursorCache[curId]);
+	CursorMan.showMouse(true);
+}
+
 } // End of namespace Video
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 91d8bd41ea2..1f72a0260d5 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -36,10 +36,12 @@
 #include "video/video_decoder.h"
 
 namespace Common {
+class Archive;
 class Rational;
 }
 
 namespace Graphics {
+class Cursor;
 struct PixelFormat;
 }
 
@@ -122,11 +124,19 @@ private:
 
 	void updateAudioBuffer();
 
+	void updateQTVRCursor(int16 x, int16 y);
+	void setCursor(int curId);
+	void cleanupCursors();
+
 	uint16 _width, _height;
 
 	uint16 _prevMouseX, _prevMouseY;
 	bool _isMouseButtonDown;
 
+	int _currentQTVRCursor = -1;
+	Common::Archive *_dataBundle = nullptr;
+	Graphics::Cursor **_cursorCache = nullptr;
+
 	bool _isVR;
 
 	uint8 _warpMode; // (2 | 1 | 0) for 2-d, 1-d or no warping


Commit: 5a1fada7373024dad6e23e57bce63cb8509168f0
    https://github.com/scummvm/scummvm/commit/5a1fada7373024dad6e23e57bce63cb8509168f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
TESTBED: Pass relative coordinates to QuickTime movie

Changed paths:
    engines/testbed/video.cpp


diff --git a/engines/testbed/video.cpp b/engines/testbed/video.cpp
index 2531dae4e95..8d214cecda1 100644
--- a/engines/testbed/video.cpp
+++ b/engines/testbed/video.cpp
@@ -27,6 +27,7 @@
 
 #include "testbed/testbed.h"
 #include "testbed/video.h"
+#include "graphics/cursorman.h"
 #include "graphics/paletteman.h"
 #include "gui/browser.h"
 
@@ -109,6 +110,9 @@ Common::Error Videotests::videoTest(Common::SeekableReadStream *stream, const Co
 			}
 
 			const Graphics::Surface *frame = video->decodeNextFrame();
+			int x = 0, y = 0;
+			int mw = 0, mh = 0;
+
 			if (frame) {
 				const Graphics::Surface *surf = frame;
 				Graphics::Surface *conv = nullptr;
@@ -117,7 +121,8 @@ Common::Error Videotests::videoTest(Common::SeekableReadStream *stream, const Co
 					surf = conv = frame->convertTo(pixelformat, video->getPalette());
 				}
 
-				int x = 0, y = 0;
+				mw = surf->w;
+				mh = surf->h;
 
 				if (surf->w < w && surf->h < h) {
 					x = (w - surf->w) >> 1;
@@ -134,18 +139,23 @@ Common::Error Videotests::videoTest(Common::SeekableReadStream *stream, const Co
 			Common::Event event;
 
 			while (g_system->getEventManager()->pollEvent(event)) {
-				switch (event.type) {
-				case Common::EVENT_LBUTTONDOWN:
-					((Video::QuickTimeDecoder *)video)->handleMouseButton(true, event.mouse.x, event.mouse.y);
-					break;
-				case Common::EVENT_LBUTTONUP:
-					((Video::QuickTimeDecoder *)video)->handleMouseButton(false);
-					break;
-				case Common::EVENT_MOUSEMOVE:
-					((Video::QuickTimeDecoder *)video)->handleMouseMove(event.mouse.x, event.mouse.y);
-					break;
-				default:
-					break;
+				if (event.mouse.x >= x && event.mouse.x < x + mw &&
+						event.mouse.y >= y && event.mouse.y < y + mh) {
+					switch (event.type) {
+					case Common::EVENT_LBUTTONDOWN:
+						((Video::QuickTimeDecoder *)video)->handleMouseButton(true, event.mouse.x - x, event.mouse.y - y);
+						break;
+					case Common::EVENT_LBUTTONUP:
+						((Video::QuickTimeDecoder *)video)->handleMouseButton(false);
+						break;
+					case Common::EVENT_MOUSEMOVE:
+						((Video::QuickTimeDecoder *)video)->handleMouseMove(event.mouse.x - x, event.mouse.y - y);
+						break;
+					default:
+						break;
+					}
+				} else {
+					CursorMan.showMouse(false);
 				}
 
 				if (Engine::shouldQuit()) {


Commit: b22892b71da7e85febf0abbd233c519c4873bb3d
    https://github.com/scummvm/scummvm/commit/b22892b71da7e85febf0abbd233c519c4873bb3d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
VIDEO: Update object cursors depending on the action

Changed paths:
    video/qt_decoder.cpp
    video/qt_decoder.h


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 2dba61495ea..7e04d970962 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -634,11 +634,10 @@ void QuickTimeDecoder::handleMouseMove(int16 x, int16 y) {
 	if (_qtvrType != QTVRType::OBJECT)
 		return;
 
-	if (!_isMouseButtonDown) {
-		updateQTVRCursor(x, y);
+	updateQTVRCursor(x, y);
 
+	if (!_isMouseButtonDown)
 		return;
-	}
 
 	VideoTrackHandler *track = (VideoTrackHandler *)_nextVideoTrack;
 
@@ -688,6 +687,8 @@ void QuickTimeDecoder::handleMouseButton(bool isDown, int16 x, int16 y) {
 		_prevMouseX = x;
 		_prevMouseY = y;
 	}
+
+	updateQTVRCursor(x, y);
 }
 
 void QuickTimeDecoder::setCurrentRow(int row) {
@@ -1250,12 +1251,31 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::forceDither(const
 
 enum {
 	kCurHand = 129,
+	kCurGrab = 130,
+	kCurObjUp = 171,
+	kCurObjDown = 172,
+	kCurObjLeft = 181,
+	kCurObjRight = 182,
 	kCurLastCursor
 };
 
 void QuickTimeDecoder::updateQTVRCursor(int16 x, int16 y) {
-	if (_qtvrType == QTVRType::OBJECT)
-		setCursor(kCurHand);
+	if (_qtvrType == QTVRType::OBJECT) {
+		if (y < _curBbox.top)
+			setCursor(kCurObjUp);
+		else if (y > _curBbox.bottom)
+			setCursor(kCurObjDown);
+		else if (x < _curBbox.left)
+			setCursor(kCurObjLeft);
+		else if (x > _curBbox.right)
+			setCursor(kCurObjRight);
+		else {
+			if (_isMouseButtonDown)
+				setCursor(kCurGrab);
+			else
+				setCursor(kCurHand);
+		}
+	}
 }
 
 void QuickTimeDecoder::cleanupCursors() {
@@ -1283,9 +1303,12 @@ void QuickTimeDecoder::setCursor(int curId) {
 		}
 	}
 
-	if (!_cursorCache)
+	if (!_cursorCache) {
 		_cursorCache = (Graphics::Cursor **)calloc(kCurLastCursor, sizeof(Graphics::Cursor *));
 
+		computeInteractivityZones();
+	}
+
 	if (curId >= kCurLastCursor)
 		error("QTVR: Incorrect cursor ID: %d > %d", curId, kCurLastCursor);
 
@@ -1312,4 +1335,12 @@ void QuickTimeDecoder::setCursor(int curId) {
 	CursorMan.showMouse(true);
 }
 
+void QuickTimeDecoder::computeInteractivityZones() {
+	_curBbox.left = MIN(20, getWidth() / 10);
+	_curBbox.right = getWidth() - _curBbox.left;
+
+	_curBbox.top = MIN(20, getHeight() / 10);
+	_curBbox.bottom = getHeight() - _curBbox.top;
+}
+
 } // End of namespace Video
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 1f72a0260d5..eea917d9f8e 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -127,11 +127,13 @@ private:
 	void updateQTVRCursor(int16 x, int16 y);
 	void setCursor(int curId);
 	void cleanupCursors();
+	void computeInteractivityZones();
 
 	uint16 _width, _height;
 
 	uint16 _prevMouseX, _prevMouseY;
 	bool _isMouseButtonDown;
+	Common::Rect _curBbox;
 
 	int _currentQTVRCursor = -1;
 	Common::Archive *_dataBundle = nullptr;


Commit: 5123119dbd8b5356cccec4b3885d55823b252bed
    https://github.com/scummvm/scummvm/commit/5123119dbd8b5356cccec4b3885d55823b252bed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
VIDEO: Move QTVR-related variables to QuickTimeDecoder class

Changed paths:
    video/qt_decoder.h


diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index eea917d9f8e..aef82ff3cdf 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -78,12 +78,12 @@ public:
 	void handleMouseMove(int16 x, int16 y);
 	void handleMouseButton(bool isDown, int16 x = -1, int16 y = -1);
 
-	float getPanAngle() const { return ((VideoTrackHandler *)_nextVideoTrack)->getPanAngle(); }
-	void setPanAngle(float panAngle) { ((VideoTrackHandler *)_nextVideoTrack)->setPanAngle(panAngle); }
-	float getTiltAngle() const { return ((VideoTrackHandler *)_nextVideoTrack)->getTiltAngle(); }
-	void setTiltAngle(float tiltAngle) { ((VideoTrackHandler *)_nextVideoTrack)->setTiltAngle(tiltAngle); }
-	float getFOV() const { return ((VideoTrackHandler *)_nextVideoTrack)->getFOV(); }
-	void setFOV(float fov) { ((VideoTrackHandler *)_nextVideoTrack)->setFOV(fov); }
+	float getPanAngle() const { return _panAngle; }
+	void setPanAngle(float panAngle) { _panAngle = panAngle; }
+	float getTiltAngle() const { return _tiltAngle; }
+	void setTiltAngle(float tiltAngle) { _tiltAngle = tiltAngle; }
+	float getFOV() const { return _fov; }
+	void setFOV(float fov) { _fov = fov; }
 
 	int getCurrentRow() { return _nextVideoTrack->getCurFrame() / _nav.columns; }
 	void setCurrentRow(int row);
@@ -143,6 +143,10 @@ private:
 
 	uint8 _warpMode; // (2 | 1 | 0) for 2-d, 1-d or no warping
 
+	float _panAngle = 0.0f;
+	float _tiltAngle = 0.0f;
+	float _fov = 0.0f;
+
 	Graphics::Surface *_scaledSurface;
 	void scaleSurface(const Graphics::Surface *src, Graphics::Surface *dst,
 			const Common::Rational &scaleFactorX, const Common::Rational &scaleFactorY);
@@ -213,13 +217,6 @@ private:
 		Common::Rational getScaledWidth() const;
 		Common::Rational getScaledHeight() const;
 
-		float getPanAngle() const { return _panAngle; }
-		void setPanAngle(float panAngle) { _panAngle = panAngle; }
-		float getTiltAngle() const { return _tiltAngle; }
-		void setTiltAngle(float tiltAngle) { _tiltAngle = tiltAngle; }
-		float getFOV() const { return _fov; }
-		void setFOV(float fov) { _fov = fov; }
-
 	private:
 		QuickTimeDecoder *_decoder;
 		Common::QuickTimeParser::Track *_parent;
@@ -233,10 +230,6 @@ private:
 		mutable bool _dirtyPalette;
 		bool _reversed;
 
-		float _panAngle;
-		float _tiltAngle;
-		float _fov;
-
 		void constructPanorama();
 		void projectPanorama();
 


Commit: 464e6f55d09c90fa3986bf7289c40dd3625c1236
    https://github.com/scummvm/scummvm/commit/464e6f55d09c90fa3986bf7289c40dd3625c1236
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
VIDEO: Compute tilt and pan angles for QTVR object movies

Changed paths:
    video/qt_decoder.cpp


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 7e04d970962..371ae6bc3bd 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -102,6 +102,13 @@ void QuickTimeDecoder::close() {
 const Graphics::Surface *QuickTimeDecoder::decodeNextFrame() {
 	const Graphics::Surface *frame = VideoDecoder::decodeNextFrame();
 
+	if (isVR()) {
+		_panAngle = (float)getCurrentColumn() / (float)_nav.columns * 360.0;
+		_tiltAngle = ((_nav.rows - 1) / 2.0 - (float)getCurrentRow()) / (float)(_nav.rows - 1) * 180.0;
+
+		debugC(1, kDebugLevelMacGUI, "QTVR: row: %d col: %d  (%d x %d) pan: %f tilt: %f", getCurrentRow(), getCurrentColumn(), _nav.rows, _nav.columns, getPanAngle(), getTiltAngle());
+	}
+
 	// Update audio buffers too
 	// (needs to be done after we find the next track)
 	updateAudioBuffer();


Commit: 35c3e69feefacc0577df9051ca295cf894244329
    https://github.com/scummvm/scummvm/commit/35c3e69feefacc0577df9051ca295cf894244329
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
VIDEO: Implement navigation cursor logic for object QTVRs

Changed paths:
    video/qt_decoder.cpp


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 371ae6bc3bd..b78f243546b 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -1261,27 +1261,31 @@ enum {
 	kCurGrab = 130,
 	kCurObjUp = 171,
 	kCurObjDown = 172,
+	kCurObjLeft90 = 173,
+	kCurObjRight90 = 174,
 	kCurObjLeft = 181,
 	kCurObjRight = 182,
+	kCurObjLeftM90 = 189,
+	kCurObjRightM90 = 190,
+	kCurObjUpLimit = 191,
+	kCurObjDownLimit = 192,
 	kCurLastCursor
 };
 
 void QuickTimeDecoder::updateQTVRCursor(int16 x, int16 y) {
 	if (_qtvrType == QTVRType::OBJECT) {
+		int tiltIdx = int((-_tiltAngle + 90.0) / 21) * 2;
+
 		if (y < _curBbox.top)
-			setCursor(kCurObjUp);
+			setCursor(tiltIdx == 0 ? kCurObjUpLimit : kCurObjUp);
 		else if (y > _curBbox.bottom)
-			setCursor(kCurObjDown);
+			setCursor(tiltIdx == 16 ? kCurObjDownLimit : kCurObjDown);
 		else if (x < _curBbox.left)
-			setCursor(kCurObjLeft);
+			setCursor(kCurObjLeft90 + tiltIdx);
 		else if (x > _curBbox.right)
-			setCursor(kCurObjRight);
-		else {
-			if (_isMouseButtonDown)
-				setCursor(kCurGrab);
-			else
-				setCursor(kCurHand);
-		}
+			setCursor(kCurObjRight90 + tiltIdx);
+		else
+			setCursor(_isMouseButtonDown ? kCurGrab : kCurHand);
 	}
 }
 


Commit: 935313cc3c69446d41b7a33735349aea7294cfe2
    https://github.com/scummvm/scummvm/commit/935313cc3c69446d41b7a33735349aea7294cfe2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:58+01:00

Commit Message:
TESTBED: Fix mouse up processing for QTVR videos

Changed paths:
    engines/testbed/video.cpp


diff --git a/engines/testbed/video.cpp b/engines/testbed/video.cpp
index 8d214cecda1..8f4fc99e56b 100644
--- a/engines/testbed/video.cpp
+++ b/engines/testbed/video.cpp
@@ -146,7 +146,7 @@ Common::Error Videotests::videoTest(Common::SeekableReadStream *stream, const Co
 						((Video::QuickTimeDecoder *)video)->handleMouseButton(true, event.mouse.x - x, event.mouse.y - y);
 						break;
 					case Common::EVENT_LBUTTONUP:
-						((Video::QuickTimeDecoder *)video)->handleMouseButton(false);
+						((Video::QuickTimeDecoder *)video)->handleMouseButton(false, event.mouse.x - x, event.mouse.y - y);
 						break;
 					case Common::EVENT_MOUSEMOVE:
 						((Video::QuickTimeDecoder *)video)->handleMouseMove(event.mouse.x - x, event.mouse.y - y);


Commit: 070820f9b8899bbbb293ebcabf3337ae12c26763
    https://github.com/scummvm/scummvm/commit/070820f9b8899bbbb293ebcabf3337ae12c26763
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-25T17:46:59+01:00

Commit Message:
VIDEO: Implement hotzones for QTVR objects, fix cursors

Changed paths:
    video/qt_decoder.cpp


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index b78f243546b..1ee19c3c349 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -688,11 +688,22 @@ void QuickTimeDecoder::handleMouseMove(int16 x, int16 y) {
 }
 
 void QuickTimeDecoder::handleMouseButton(bool isDown, int16 x, int16 y) {
-	_isMouseButtonDown = isDown;
-
 	if (isDown) {
-		_prevMouseX = x;
-		_prevMouseY = y;
+		if (y < _curBbox.top) {
+			setCurrentRow(getCurrentRow() + 1);
+		} else if (y > _curBbox.bottom) {
+			setCurrentRow(getCurrentRow() - 1);
+		} else if (x < _curBbox.left) {
+			setCurrentColumn((getCurrentColumn() + 1) % _nav.columns);
+		} else if (x > _curBbox.right) {
+			setCurrentColumn((getCurrentColumn() - 1 + _nav.columns) % _nav.columns);
+		} else {
+			_prevMouseX = x;
+			_prevMouseY = y;
+			_isMouseButtonDown = isDown;
+		}
+	} else {
+		_isMouseButtonDown = isDown;
 	}
 
 	updateQTVRCursor(x, y);
@@ -1259,16 +1270,14 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::forceDither(const
 enum {
 	kCurHand = 129,
 	kCurGrab = 130,
-	kCurObjUp = 171,
-	kCurObjDown = 172,
-	kCurObjLeft90 = 173,
-	kCurObjRight90 = 174,
-	kCurObjLeft = 181,
-	kCurObjRight = 182,
-	kCurObjLeftM90 = 189,
-	kCurObjRightM90 = 190,
-	kCurObjUpLimit = 191,
-	kCurObjDownLimit = 192,
+	kCurObjUp = 131,
+	kCurObjDown = 132,
+	kCurObjLeft90 = 133,
+	kCurObjRight90 = 134,
+	kCurObjLeftM90 = 149,
+	kCurObjRightM90 = 150,
+	kCurObjUpLimit = 151,
+	kCurObjDownLimit = 152,
 	kCurLastCursor
 };
 
@@ -1277,9 +1286,9 @@ void QuickTimeDecoder::updateQTVRCursor(int16 x, int16 y) {
 		int tiltIdx = int((-_tiltAngle + 90.0) / 21) * 2;
 
 		if (y < _curBbox.top)
-			setCursor(tiltIdx == 0 ? kCurObjUpLimit : kCurObjUp);
+			setCursor(tiltIdx == 16 ? kCurObjUpLimit : kCurObjUp);
 		else if (y > _curBbox.bottom)
-			setCursor(tiltIdx == 16 ? kCurObjDownLimit : kCurObjDown);
+			setCursor(tiltIdx == 0 ? kCurObjDownLimit : kCurObjDown);
 		else if (x < _curBbox.left)
 			setCursor(kCurObjLeft90 + tiltIdx);
 		else if (x > _curBbox.right)




More information about the Scummvm-git-logs mailing list