cc-pets 2.2.0 → 2.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8,6 +8,9 @@
8
8
  #import "CCPetsBridge.h"
9
9
  #import "CCPetsGlassView.h"
10
10
  #import "MenuChoiceRow.h"
11
+ #import "MenuPetSizeView.h"
12
+ #import "CCPetsPetSize.h"
13
+ #import "CCPetsPhrases.h"
11
14
 
12
15
  // 碎碎念频率档位的 defaults 键。定义在 CCPetsAppDelegate+Speech.m,这里只读不写;
13
16
  // 单独 extern 而不 import 那个头文件,是因为它反过来 import 了 PetView.h。
@@ -82,6 +85,7 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
82
85
  // 精灵内容单独挂一层:呼吸、弹簧、落地 squash 都要对这一层做 CA 动画,放在视图自己的
83
86
  // layer 上会连带影响命中测试和子视图几何。
84
87
  @property CALayer *spriteLayer;
88
+ @property NSSize spriteCacheSize;
85
89
  // 当前帧已经停了几拍,够 frameHolds 里那个数才推进。
86
90
  @property NSUInteger holdTicks;
87
91
  // 待机当前的速度档(拍/帧)。行为已关,字段留给微动层的慢放用。
@@ -939,7 +943,7 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
939
943
  //
940
944
  // 试过两条更"聪明"的路,都不行,别改回去:
941
945
  // 1. CGImageCreateWithImageInRect 预裁——素材经 LoadPetSpriteImage 缩略后不保证能被
942
- // 8 列 rowCount 行整除(默认素材 1536×1872 会装成 1120×1365,cellHeight=151.67),
946
+ // 8 列 rowCount 行整除(超大素材缩略后可能得到小数尺寸的源格),
943
947
  // 小数矩形会被取整,采样相位偏掉,边缘整行错位。
944
948
  // 2. 整表交给 layer + contentsRect 选帧——CA 自己的最近邻缩放相位同样和 NSImage 对不上,
945
949
  // 实测形状吻合度反而从 99.4% 掉到 93.5%。
@@ -956,6 +960,7 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
956
960
  // 原来给 48 格 = 15.4MB,而真实活跃工作集只有待机 6 帧 + 当前动作 ≤8 帧 +
957
961
  // 偶尔几个朝向格,20 格足够,超出的部分纯粹是白占着。
958
962
  NSSize pointSize = NSInsetRect(self.bounds, 2, 0).size;
963
+ self.spriteCacheSize = pointSize;
959
964
  NSUInteger cellCost = (NSUInteger)(ceil(pointSize.width * scale) *
960
965
  ceil(pointSize.height * scale) * 4);
961
966
  NSUInteger affordable = MIN((NSUInteger)(self.spriteRowCount * 8), (NSUInteger)20);
@@ -963,7 +968,7 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
963
968
  [self updateSpriteContents];
964
969
  }
965
970
  // 视网膜屏上必须按 backingScaleFactor 栅格化。原来 drawRect: 是直接画进 2x 的后备存储,
966
- // 等于用更高分辨率去采样那个 151.67 高的源格;预栅格化成 1x 位图再让 layer 放大,
971
+ // 等于按实际屏幕分辨率采样源格;预栅格化成 1x 位图再让 layer 放大,
967
972
  // 会比改造前糊一档。
968
973
  - (CGFloat)spriteScale {
969
974
  CGFloat scale = self.window.backingScaleFactor;
@@ -1046,7 +1051,22 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1046
1051
  }
1047
1052
  - (void)layout {
1048
1053
  [super layout];
1054
+ [self refreshSpriteSize];
1055
+ }
1056
+ - (void)refreshSpriteSize {
1049
1057
  [self layoutSpriteLayer];
1058
+ // 每格缓存的键只包含行/帧,尺寸改变后必须清掉旧尺寸的位图。
1059
+ if (!NSEqualSizes(self.spriteCacheSize, NSInsetRect(self.bounds, 2, 0).size)) {
1060
+ [self rebuildSpriteCache];
1061
+ }
1062
+ }
1063
+ - (void)setFrame:(NSRect)newFrame {
1064
+ [super setFrame:newFrame];
1065
+ [self refreshSpriteSize];
1066
+ }
1067
+ - (void)setFrameSize:(NSSize)newSize {
1068
+ [super setFrameSize:newSize];
1069
+ [self refreshSpriteSize];
1050
1070
  }
1051
1071
  // 锚点是脚底 (0.5, 0),所以不能直接设 frame——那会把锚点当左下角算。改用 bounds + position。
1052
1072
  - (void)layoutSpriteLayer {
@@ -1592,6 +1612,14 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1592
1612
  }
1593
1613
  self.activePetSwitchMenu = switchMenu;
1594
1614
  switchItem.submenu = switchMenu;
1615
+ NSMenuItem *sizeItem = [menu addItemWithTitle:L(@"Pet Size") action:nil keyEquivalent:@""];
1616
+ NSMenu *sizeMenu = [[NSMenu alloc] initWithTitle:L(@"Pet Size")];
1617
+ NSMenuItem *sizeControl = [[NSMenuItem alloc] initWithTitle:L(@"Pet Size")
1618
+ action:nil keyEquivalent:@""];
1619
+ sizeControl.view = [[MenuPetSizeView alloc] initWithScale:CCPetsPetScalePreference()
1620
+ target:NSApp.delegate action:@selector(setPetSizeFromSlider:)];
1621
+ [sizeMenu addItem:sizeControl];
1622
+ sizeItem.submenu = sizeMenu;
1595
1623
  [menu addItem:NSMenuItem.separatorItem];
1596
1624
  [self addPersistentSwitchToMenu:menu
1597
1625
  title:L(@"Show Status Card")
@@ -1692,13 +1720,11 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1692
1720
  NSString *number = value.doubleValue == value.integerValue ?
1693
1721
  [NSString stringWithFormat:@"%ld", (long)value.integerValue] :
1694
1722
  [NSString stringWithFormat:@"%.1f", value.doubleValue];
1695
- NSMenuItem *option = [options addItemWithTitle:
1696
- [number stringByAppendingString:group[@"suffix"]]
1697
- action:NSSelectorFromString(group[@"action"]) keyEquivalent:@""];
1698
- option.target = NSApp.delegate;
1699
- option.representedObject = value;
1700
- option.state = fabs(current.doubleValue - value.doubleValue) < 0.001 ?
1701
- NSControlStateValueOn : NSControlStateValueOff;
1723
+ [MenuChoiceRowView addToMenu:options
1724
+ title:[number stringByAppendingString:group[@"suffix"]] group:group[@"key"]
1725
+ representedObject:value checked:fabs(current.doubleValue - value.doubleValue) < 0.001
1726
+ target:NSApp.delegate action:NSSelectorFromString(group[@"action"])
1727
+ width:PetSubmenuRowWidth];
1702
1728
  }
1703
1729
  groupItem.submenu = options;
1704
1730
  }
@@ -1733,10 +1759,9 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1733
1759
  width:PetSubmenuRowWidth
1734
1760
  tag:1];
1735
1761
  // 频率是四道闸的组合,单调任何一道都不会真的变频繁,所以只给一个档位。
1736
- // 用系统的打勾单选行,不用自绘开关:这几项互斥,开关会看起来像四个独立选项。
1737
- [speechMenu addItem:NSMenuItem.separatorItem];
1738
- NSMenuItem *frequencyHeader = [speechMenu addItemWithTitle:L(@"Frequency") action:nil keyEquivalent:@""];
1739
- frequencyHeader.enabled = NO;
1762
+ // 单选行负责互斥勾选,鼠标点击后保持菜单展开。
1763
+ NSMenuItem *frequencyItem = [speechMenu addItemWithTitle:L(@"Frequency") action:nil keyEquivalent:@""];
1764
+ NSMenu *frequencyMenu = [NSMenu new];
1740
1765
  NSString *frequency = [NSUserDefaults.standardUserDefaults
1741
1766
  stringForKey:PetSpeechFrequencyKey] ?: @"normal";
1742
1767
  NSArray<NSDictionary *> *frequencyOptions = @[
@@ -1746,15 +1771,23 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1746
1771
  @{@"title": L(@"Chatty"), @"value": @"chatty"},
1747
1772
  ];
1748
1773
  for (NSDictionary *option in frequencyOptions) {
1749
- NSMenuItem *item = [speechMenu addItemWithTitle:option[@"title"]
1750
- action:@selector(setSpeechFrequency:) keyEquivalent:@""];
1751
- item.target = NSApp.delegate;
1752
- item.representedObject = option[@"value"];
1753
- item.state = [frequency isEqualToString:option[@"value"]] ?
1754
- NSControlStateValueOn : NSControlStateValueOff;
1755
- item.indentationLevel = 1;
1774
+ [MenuChoiceRowView addToMenu:frequencyMenu title:option[@"title"] group:@"speechFrequency"
1775
+ representedObject:option[@"value"] checked:[frequency isEqualToString:option[@"value"]]
1776
+ target:NSApp.delegate action:@selector(setSpeechFrequency:) width:PetSubmenuRowWidth];
1777
+ }
1778
+ frequencyItem.submenu = frequencyMenu;
1779
+ NSMenuItem *sourceItem = [speechMenu addItemWithTitle:L(@"Line Source")
1780
+ action:nil keyEquivalent:@""];
1781
+ NSMenu *sourceMenu = [NSMenu new];
1782
+ NSString *source = PetPhrasesSource();
1783
+ for (NSArray<NSString *> *option in @[
1784
+ @[L(@"Pet-specific Lines"), PetPhrasesSourcePet],
1785
+ @[L(@"Default Lines"), PetPhrasesSourceDefault]]) {
1786
+ [MenuChoiceRowView addToMenu:sourceMenu title:option[0] group:@"phrasesSource"
1787
+ representedObject:option[1] checked:[source isEqualToString:option[1]]
1788
+ target:NSApp.delegate action:@selector(setPhrasesSource:) width:PetSubmenuRowWidth];
1756
1789
  }
1757
- [speechMenu addItem:NSMenuItem.separatorItem];
1790
+ sourceItem.submenu = sourceMenu;
1758
1791
  // 没有这个入口,九成用户不会知道台词可以自己改。
1759
1792
  NSMenuItem *editPhrases = [speechMenu addItemWithTitle:L(@"Edit Lines…")
1760
1793
  action:@selector(editPhrasesFile:) keyEquivalent:@""];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cc-pets",
3
- "version": "2.2.0",
3
+ "version": "2.2.1",
4
4
  "description": "A native macOS desktop pet for Codex CLI and Claude Code",
5
5
  "author": {
6
6
  "name": "Sunnyshiny",