• R/O
  • HTTP
  • SSH
  • HTTPS

main: Commit

Elis ColorsのMainリポジトリ。


Commit MetaInfo

Revisionca8a3e3b22b0133cd874fe41dfd24170c3c26344 (tree)
Time2009-09-27 00:10:34
AuthorYanagi Asakura <yanagi.entertainment@gmai...>
CommiterYanagi Asakura

Log Message

add core image kernel

Change Summary

Incremental Difference

--- a/Elis Colors.xcodeproj/project.pbxproj
+++ b/Elis Colors.xcodeproj/project.pbxproj
@@ -13,8 +13,6 @@
1313 5C0DDDC5106B5652008425EE /* ElisUndoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C0DDDC4106B5652008425EE /* ElisUndoManager.m */; };
1414 5C480238106D165B00DF0CBB /* movieSizeWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C480236106D165B00DF0CBB /* movieSizeWindow.xib */; };
1515 5C56077F105FB3B70094F837 /* ElisPropertyTableController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C56077E105FB3B70094F837 /* ElisPropertyTableController.m */; };
16- 5C560820105FCA140094F837 /* ElisCoreImageKernel.cikernel in Sources */ = {isa = PBXBuildFile; fileRef = 5C56081D105FCA140094F837 /* ElisCoreImageKernel.cikernel */; };
17- 5C560821105FCA140094F837 /* ElisCustomFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C56081F105FCA140094F837 /* ElisCustomFilter.m */; };
1816 5C72E60B106DD74000A96925 /* ElisMovieSizeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C72E60A106DD74000A96925 /* ElisMovieSizeWindowController.m */; };
1917 5C72E689106DED1600A96925 /* Preference.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C72E687106DED1600A96925 /* Preference.xib */; };
2018 5C72E68C106DF1D400A96925 /* ElisPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C72E68B106DF1D400A96925 /* ElisPreferenceController.m */; };
@@ -28,6 +26,8 @@
2826 5C9F358E105F7C0F00D87A46 /* ElisKeyframe.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9F358D105F7C0F00D87A46 /* ElisKeyframe.m */; };
2927 5CB6798C10637CA400FC5F9F /* lightgreen.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5CB6798A10637CA400FC5F9F /* lightgreen.jpg */; };
3028 5CB6798D10637CA400FC5F9F /* orange.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5CB6798B10637CA400FC5F9F /* orange.jpg */; };
29+ 5CB9424D106E662F0050FB6B /* ElisCoreImageKernel.cikernel in Sources */ = {isa = PBXBuildFile; fileRef = 5CB9424A106E662F0050FB6B /* ElisCoreImageKernel.cikernel */; };
30+ 5CB9424E106E662F0050FB6B /* ElisCustomFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CB9424C106E662F0050FB6B /* ElisCustomFilter.m */; };
3131 5CE2691F105B6FCE0082C63A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2691E105B6FCE0082C63A /* QuartzCore.framework */; };
3232 5CE26923105B6FDE0082C63A /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE26922105B6FDE0082C63A /* Quartz.framework */; };
3333 5CE26928105B6FE90082C63A /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE26927105B6FE90082C63A /* QTKit.framework */; };
@@ -66,9 +66,6 @@
6666 5C480237106D165B00DF0CBB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/movieSizeWindow.xib; sourceTree = "<group>"; };
6767 5C56077D105FB3B70094F837 /* ElisPropertyTableController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisPropertyTableController.h; sourceTree = "<group>"; };
6868 5C56077E105FB3B70094F837 /* ElisPropertyTableController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisPropertyTableController.m; sourceTree = "<group>"; };
69- 5C56081D105FCA140094F837 /* ElisCoreImageKernel.cikernel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = ElisCoreImageKernel.cikernel; path = ../Elis/ElisCoreImageKernel.cikernel; sourceTree = SOURCE_ROOT; };
70- 5C56081E105FCA140094F837 /* ElisCustomFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ElisCustomFilter.h; path = ../Elis/ElisCustomFilter.h; sourceTree = SOURCE_ROOT; };
71- 5C56081F105FCA140094F837 /* ElisCustomFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ElisCustomFilter.m; path = ../Elis/ElisCustomFilter.m; sourceTree = SOURCE_ROOT; };
7269 5C72E609106DD74000A96925 /* ElisMovieSizeWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisMovieSizeWindowController.h; sourceTree = "<group>"; };
7370 5C72E60A106DD74000A96925 /* ElisMovieSizeWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisMovieSizeWindowController.m; sourceTree = "<group>"; };
7471 5C72E688106DED1600A96925 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preference.xib; sourceTree = "<group>"; };
@@ -89,6 +86,9 @@
8986 5C9F358D105F7C0F00D87A46 /* ElisKeyframe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisKeyframe.m; sourceTree = "<group>"; };
9087 5CB6798A10637CA400FC5F9F /* lightgreen.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = lightgreen.jpg; path = image/lightgreen.jpg; sourceTree = "<group>"; };
9188 5CB6798B10637CA400FC5F9F /* orange.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = orange.jpg; path = image/orange.jpg; sourceTree = "<group>"; };
89+ 5CB9424A106E662F0050FB6B /* ElisCoreImageKernel.cikernel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ElisCoreImageKernel.cikernel; sourceTree = "<group>"; };
90+ 5CB9424B106E662F0050FB6B /* ElisCustomFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisCustomFilter.h; sourceTree = "<group>"; };
91+ 5CB9424C106E662F0050FB6B /* ElisCustomFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisCustomFilter.m; sourceTree = "<group>"; };
9292 5CE26911105B6F880082C63A /* ElisBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisBase.h; sourceTree = "<group>"; };
9393 5CE2691E105B6FCE0082C63A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
9494 5CE26922105B6FDE0082C63A /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
@@ -271,9 +271,9 @@
271271 5C56081C105FC9D20094F837 /* Core Image Kernel */ = {
272272 isa = PBXGroup;
273273 children = (
274- 5C56081D105FCA140094F837 /* ElisCoreImageKernel.cikernel */,
275- 5C56081E105FCA140094F837 /* ElisCustomFilter.h */,
276- 5C56081F105FCA140094F837 /* ElisCustomFilter.m */,
274+ 5CB9424A106E662F0050FB6B /* ElisCoreImageKernel.cikernel */,
275+ 5CB9424B106E662F0050FB6B /* ElisCustomFilter.h */,
276+ 5CB9424C106E662F0050FB6B /* ElisCustomFilter.m */,
277277 );
278278 name = "Core Image Kernel";
279279 sourceTree = "<group>";
@@ -408,8 +408,6 @@
408408 5C9F358B105F7BEA00D87A46 /* ElisEffect.m in Sources */,
409409 5C9F358E105F7C0F00D87A46 /* ElisKeyframe.m in Sources */,
410410 5C56077F105FB3B70094F837 /* ElisPropertyTableController.m in Sources */,
411- 5C560820105FCA140094F837 /* ElisCoreImageKernel.cikernel in Sources */,
412- 5C560821105FCA140094F837 /* ElisCustomFilter.m in Sources */,
413411 5CF28DC310624BCE00C49262 /* ElisMediaBrowserController.m in Sources */,
414412 5CF28E0D1062581900C49262 /* ElisWriter.m in Sources */,
415413 5C8A4811106A66ED00EC2F3D /* ElisWriterLegacy.m in Sources */,
@@ -417,6 +415,8 @@
417415 5C72E60B106DD74000A96925 /* ElisMovieSizeWindowController.m in Sources */,
418416 5C72E68C106DF1D400A96925 /* ElisPreferenceController.m in Sources */,
419417 5C72E74C106E0CE800A96925 /* ElisWriterDummyView.m in Sources */,
418+ 5CB9424D106E662F0050FB6B /* ElisCoreImageKernel.cikernel in Sources */,
419+ 5CB9424E106E662F0050FB6B /* ElisCustomFilter.m in Sources */,
420420 );
421421 runOnlyForDeploymentPostprocessing = 0;
422422 };
--- /dev/null
+++ b/ElisCoreImageKernel.cikernel
@@ -0,0 +1,16 @@
1+/*
2+ * ElisCoreImageKernel.cikernel
3+ * Elis
4+ *
5+ * Created by 柳 on 09/09/02.
6+ * Copyright 2009 Yanagi Entertainment. All rights reserved.
7+ *
8+ */
9+
10+kernel vec4 opacityKernel(sampler src, float value)
11+{
12+ vec4 dst;
13+ dst = sample(src, samplerCoord(src));
14+ dst.a *= value;
15+ return dst;
16+}
--- /dev/null
+++ b/ElisCustomFilter.h
@@ -0,0 +1,43 @@
1+// Copyright (c) 2009 Yanagi Asakura
2+//
3+// This software is provided 'as-is', without any express or implied
4+// warranty. In no event will the authors be held liable for any damages
5+// arising from the use of this software.
6+//
7+// Permission is granted to anyone to use this software for any purpose,
8+// including commercial applications, and to alter it and redistribute it
9+// freely, subject to the following restrictions:
10+//
11+// 1. The origin of this software must not be misrepresented; you must not
12+// claim that you wrote the original software. If you use this software
13+// in a product, an acknowledgment in the product documentation would be
14+// appreciated but is not required.
15+//
16+// 2. Altered source versions must be plainly marked as such, and must not be
17+// misrepresented as being the original software.
18+//
19+// 3. This notice may not be removed or altered from any source
20+// distribution.
21+
22+//
23+// ElisCustomFilter.h
24+// Elis
25+//
26+// Created by 柳 on 09/09/02.
27+// Copyright 2009 Yanagi Entertainment. All rights reserved.
28+//
29+
30+// オレオレCore Imageフィルタ。
31+
32+// CIOpacity : 画像の透過度を変化させるフィルタ。
33+// inputOpacity=0.0-1.0 default=1.0
34+
35+#import <Cocoa/Cocoa.h>
36+#import <QuartzCore/QuartzCore.h>
37+
38+@interface ElisCustomFilter : CIFilter {
39+ CIImage* inputImage;
40+ NSNumber* inputOpacity;
41+}
42+
43+@end
--- /dev/null
+++ b/ElisCustomFilter.m
@@ -0,0 +1,82 @@
1+// Copyright (c) 2009 Yanagi Asakura
2+//
3+// This software is provided 'as-is', without any express or implied
4+// warranty. In no event will the authors be held liable for any damages
5+// arising from the use of this software.
6+//
7+// Permission is granted to anyone to use this software for any purpose,
8+// including commercial applications, and to alter it and redistribute it
9+// freely, subject to the following restrictions:
10+//
11+// 1. The origin of this software must not be misrepresented; you must not
12+// claim that you wrote the original software. If you use this software
13+// in a product, an acknowledgment in the product documentation would be
14+// appreciated but is not required.
15+//
16+// 2. Altered source versions must be plainly marked as such, and must not be
17+// misrepresented as being the original software.
18+//
19+// 3. This notice may not be removed or altered from any source
20+// distribution.
21+
22+//
23+// ElisCustomFilter.m
24+// Elis
25+//
26+// Created by 柳 on 09/09/02.
27+// Copyright 2009 Yanagi Entertainment. All rights reserved.
28+//
29+
30+#import "ElisCustomFilter.h"
31+
32+@implementation ElisCustomFilter
33+
34+static CIKernel *s_opacityKernel = nil;
35+
36+- (id)init
37+{
38+ if(s_opacityKernel == nil){
39+ NSBundle *bundle = [NSBundle bundleForClass:[self class]];
40+ NSString *code = [NSString stringWithContentsOfFile:[bundle pathForResource:@"ElisCoreImageKernel" ofType:@"cikernel"]];
41+ NSArray *kernels = [CIKernel kernelsWithString:code];
42+ s_opacityKernel = [[kernels objectAtIndex:0] retain];
43+ }
44+
45+ return [super init];
46+}
47+
48++ (void)initialize
49+{
50+ NSLog(@"Initializing Custom Filter ...");
51+
52+ [CIFilter registerFilterName:@"CIOpacity"
53+ constructor:self
54+ classAttributes:[NSDictionary dictionaryWithObjectsAndKeys:@"Change", kCIAttributeFilterDisplayName,
55+ [NSArray arrayWithObjects:kCICategoryColorAdjustment, kCICategoryVideo, kCICategoryStillImage,
56+ kCICategoryNonSquarePixels, nil], kCIAttributeFilterCategories,
57+ [NSDictionary dictionaryWithObjectsAndKeys:
58+ [NSNumber numberWithDouble:0.0], kCIAttributeMin,
59+ [NSNumber numberWithDouble:1.0], kCIAttributeMax,
60+ [NSNumber numberWithDouble:0.0], kCIAttributeSliderMin,
61+ [NSNumber numberWithDouble:1.0], kCIAttributeSliderMax,
62+ [NSNumber numberWithDouble:1.0], kCIAttributeDefault,
63+ [NSNumber numberWithDouble:1.0], kCIAttributeIdentity,
64+ kCIAttributeTypeScalar, kCIAttributeType, nil], @"inputOpacity", nil]];
65+}
66+
67+- (CIImage*)outputImage
68+{
69+ CISampler *src = [CISampler samplerWithImage:inputImage];
70+
71+ return [self apply:s_opacityKernel, src, inputOpacity, kCIApplyOptionDefinition, [src definition], nil];
72+}
73+
74++ (CIFilter*)filterWithName:(NSString *)name
75+{
76+ CIFilter *filter;
77+
78+ filter = [[self alloc] init];
79+ return [filter autorelease];
80+}
81+
82+@end
--- a/ElisMedia.m
+++ b/ElisMedia.m
@@ -256,8 +256,8 @@
256256
257257 if(movie) flag = 0;
258258 else if(sound) flag = 1;
259- else if(image) flag = 2;
260259 else if(text) flag = 3;
260+ else if(image) flag = 2;
261261
262262 [encoder encodeInt:flag forKey:@"flag"];
263263 }
@@ -266,7 +266,7 @@
266266 {
267267 int flag;
268268 NSString* path = [coder decodeObjectForKey:@"path"];
269- NSString* t = [coder decodeObjectForKey:@"text"];
269+ NSAttributedString* t = [coder decodeObjectForKey:@"text"];
270270 flag = [coder decodeIntForKey:@"flag"];
271271
272272 if(flag == 0)
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1800,25 +1800,25 @@
18001800 <reference key="NSColor" ref="4404863"/>
18011801 <reference key="NSTabView" ref="83094786"/>
18021802 </object>
1803- <object class="NSTabViewItem" id="261574702">
1803+ <object class="NSTabViewItem" id="1049445031">
18041804 <string key="NSIdentifier">Item 2</string>
1805- <object class="NSView" key="NSView" id="602300180">
1805+ <object class="NSView" key="NSView" id="829686118">
18061806 <reference key="NSNextResponder" ref="83094786"/>
18071807 <int key="NSvFlags">256</int>
18081808 <object class="NSMutableArray" key="NSSubviews">
18091809 <bool key="EncodedWithXMLCoder">YES</bool>
1810- <object class="NSScrollView" id="727568098">
1811- <reference key="NSNextResponder" ref="602300180"/>
1810+ <object class="NSScrollView" id="291824860">
1811+ <reference key="NSNextResponder" ref="829686118"/>
18121812 <int key="NSvFlags">306</int>
18131813 <object class="NSMutableArray" key="NSSubviews">
18141814 <bool key="EncodedWithXMLCoder">YES</bool>
1815- <object class="NSClipView" id="830695821">
1816- <reference key="NSNextResponder" ref="727568098"/>
1815+ <object class="NSClipView" id="676423734">
1816+ <reference key="NSNextResponder" ref="291824860"/>
18171817 <int key="NSvFlags">2304</int>
18181818 <object class="NSMutableArray" key="NSSubviews">
18191819 <bool key="EncodedWithXMLCoder">YES</bool>
1820- <object class="NSTextView" id="719198021">
1821- <reference key="NSNextResponder" ref="830695821"/>
1820+ <object class="NSTextView" id="894122042">
1821+ <reference key="NSNextResponder" ref="676423734"/>
18221822 <int key="NSvFlags">2322</int>
18231823 <object class="NSMutableSet" key="NSDragTypes">
18241824 <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1844,8 +1844,8 @@
18441844 </object>
18451845 </object>
18461846 <string key="NSFrameSize">{491, 14}</string>
1847- <reference key="NSSuperview" ref="830695821"/>
1848- <object class="NSTextContainer" key="NSTextContainer" id="361238514">
1847+ <reference key="NSSuperview" ref="676423734"/>
1848+ <object class="NSTextContainer" key="NSTextContainer" id="643847126">
18491849 <object class="NSLayoutManager" key="NSLayoutManager">
18501850 <object class="NSTextStorage" key="NSTextStorage">
18511851 <object class="NSMutableString" key="NSString">
@@ -1855,12 +1855,12 @@
18551855 </object>
18561856 <object class="NSMutableArray" key="NSTextContainers">
18571857 <bool key="EncodedWithXMLCoder">YES</bool>
1858- <reference ref="361238514"/>
1858+ <reference ref="643847126"/>
18591859 </object>
18601860 <int key="NSLMFlags">134</int>
18611861 <nil key="NSDelegate"/>
18621862 </object>
1863- <reference key="NSTextView" ref="719198021"/>
1863+ <reference key="NSTextView" ref="894122042"/>
18641864 <double key="NSWidth">491</double>
18651865 <int key="NSTCFlags">1</int>
18661866 </object>
@@ -1926,9 +1926,9 @@
19261926 </object>
19271927 </object>
19281928 <string key="NSFrame">{{1, 1}, {491, 425}}</string>
1929- <reference key="NSSuperview" ref="727568098"/>
1930- <reference key="NSNextKeyView" ref="719198021"/>
1931- <reference key="NSDocView" ref="719198021"/>
1929+ <reference key="NSSuperview" ref="291824860"/>
1930+ <reference key="NSNextKeyView" ref="894122042"/>
1931+ <reference key="NSDocView" ref="894122042"/>
19321932 <object class="NSColor" key="NSBGColor" id="306746733">
19331933 <int key="NSColorSpace">3</int>
19341934 <bytes key="NSWhite">MQA</bytes>
@@ -1939,34 +1939,34 @@
19391939 </object>
19401940 <int key="NScvFlags">4</int>
19411941 </object>
1942- <object class="NSScroller" id="760498183">
1943- <reference key="NSNextResponder" ref="727568098"/>
1942+ <object class="NSScroller" id="330248010">
1943+ <reference key="NSNextResponder" ref="291824860"/>
19441944 <int key="NSvFlags">256</int>
19451945 <string key="NSFrame">{{492, 1}, {15, 425}}</string>
1946- <reference key="NSSuperview" ref="727568098"/>
1947- <reference key="NSTarget" ref="727568098"/>
1946+ <reference key="NSSuperview" ref="291824860"/>
1947+ <reference key="NSTarget" ref="291824860"/>
19481948 <string key="NSAction">_doScroller:</string>
19491949 <double key="NSPercent">0.99248120300751874</double>
19501950 </object>
1951- <object class="NSScroller" id="672635734">
1952- <reference key="NSNextResponder" ref="727568098"/>
1951+ <object class="NSScroller" id="400799124">
1952+ <reference key="NSNextResponder" ref="291824860"/>
19531953 <int key="NSvFlags">-2147483392</int>
19541954 <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
1955- <reference key="NSSuperview" ref="727568098"/>
1955+ <reference key="NSSuperview" ref="291824860"/>
19561956 <int key="NSsFlags">1</int>
1957- <reference key="NSTarget" ref="727568098"/>
1957+ <reference key="NSTarget" ref="291824860"/>
19581958 <string key="NSAction">_doScroller:</string>
19591959 <double key="NSCurValue">1</double>
19601960 <double key="NSPercent">0.94565218687057495</double>
19611961 </object>
19621962 </object>
19631963 <string key="NSFrame">{{17, 17}, {508, 427}}</string>
1964- <reference key="NSSuperview" ref="602300180"/>
1965- <reference key="NSNextKeyView" ref="830695821"/>
1964+ <reference key="NSSuperview" ref="829686118"/>
1965+ <reference key="NSNextKeyView" ref="676423734"/>
19661966 <int key="NSsFlags">18</int>
1967- <reference key="NSVScroller" ref="760498183"/>
1968- <reference key="NSHScroller" ref="672635734"/>
1969- <reference key="NSContentView" ref="830695821"/>
1967+ <reference key="NSVScroller" ref="330248010"/>
1968+ <reference key="NSHScroller" ref="400799124"/>
1969+ <reference key="NSContentView" ref="676423734"/>
19701970 </object>
19711971 </object>
19721972 <string key="NSFrame">{{10, 33}, {542, 447}}</string>
@@ -2247,14 +2247,14 @@
22472247 <reference key="NSTabView" ref="83094786"/>
22482248 </object>
22492249 </object>
2250- <reference key="NSSelectedTabViewItem" ref="261574702"/>
2250+ <reference key="NSSelectedTabViewItem" ref="1049445031"/>
22512251 <reference key="NSFont" ref="1004466011"/>
22522252 <int key="NSTvFlags">0</int>
22532253 <bool key="NSAllowTruncatedLabels">YES</bool>
22542254 <bool key="NSDrawsBackground">YES</bool>
22552255 <object class="NSMutableArray" key="NSSubviews">
22562256 <bool key="EncodedWithXMLCoder">YES</bool>
2257- <reference ref="602300180"/>
2257+ <reference ref="829686118"/>
22582258 </object>
22592259 </object>
22602260 <object class="NSOpenGLView" id="132559063">
@@ -3309,14 +3309,14 @@
33093309 <object class="IBOutletConnection" key="connection">
33103310 <string key="label">_textLayerField</string>
33113311 <reference key="source" ref="690852348"/>
3312- <reference key="destination" ref="719198021"/>
3312+ <reference key="destination" ref="894122042"/>
33133313 </object>
33143314 <int key="connectionID">683</int>
33153315 </object>
33163316 <object class="IBConnectionRecord">
33173317 <object class="IBOutletConnection" key="connection">
33183318 <string key="label">delegate</string>
3319- <reference key="source" ref="719198021"/>
3319+ <reference key="source" ref="894122042"/>
33203320 <reference key="destination" ref="690852348"/>
33213321 </object>
33223322 <int key="connectionID">685</int>
@@ -3325,7 +3325,7 @@
33253325 <object class="IBOutletConnection" key="connection">
33263326 <string key="label">_textLayerFiled</string>
33273327 <reference key="source" ref="986578374"/>
3328- <reference key="destination" ref="719198021"/>
3328+ <reference key="destination" ref="894122042"/>
33293329 </object>
33303330 <int key="connectionID">686</int>
33313331 </object>
@@ -4489,7 +4489,7 @@
44894489 <bool key="EncodedWithXMLCoder">YES</bool>
44904490 <reference ref="615081872"/>
44914491 <reference ref="722773087"/>
4492- <reference ref="261574702"/>
4492+ <reference ref="1049445031"/>
44934493 </object>
44944494 <reference key="parent" ref="439893737"/>
44954495 </object>
@@ -4727,47 +4727,47 @@
47274727 </object>
47284728 <object class="IBObjectRecord">
47294729 <int key="objectID">668</int>
4730- <reference key="object" ref="261574702"/>
4730+ <reference key="object" ref="1049445031"/>
47314731 <object class="NSMutableArray" key="children">
47324732 <bool key="EncodedWithXMLCoder">YES</bool>
4733- <reference ref="602300180"/>
4733+ <reference ref="829686118"/>
47344734 </object>
47354735 <reference key="parent" ref="83094786"/>
47364736 </object>
47374737 <object class="IBObjectRecord">
47384738 <int key="objectID">669</int>
4739- <reference key="object" ref="602300180"/>
4739+ <reference key="object" ref="829686118"/>
47404740 <object class="NSMutableArray" key="children">
47414741 <bool key="EncodedWithXMLCoder">YES</bool>
4742- <reference ref="727568098"/>
4742+ <reference ref="291824860"/>
47434743 </object>
4744- <reference key="parent" ref="261574702"/>
4744+ <reference key="parent" ref="1049445031"/>
47454745 </object>
47464746 <object class="IBObjectRecord">
47474747 <int key="objectID">679</int>
4748- <reference key="object" ref="727568098"/>
4748+ <reference key="object" ref="291824860"/>
47494749 <object class="NSMutableArray" key="children">
47504750 <bool key="EncodedWithXMLCoder">YES</bool>
4751- <reference ref="760498183"/>
4752- <reference ref="672635734"/>
4753- <reference ref="719198021"/>
4751+ <reference ref="330248010"/>
4752+ <reference ref="400799124"/>
4753+ <reference ref="894122042"/>
47544754 </object>
4755- <reference key="parent" ref="602300180"/>
4755+ <reference key="parent" ref="829686118"/>
47564756 </object>
47574757 <object class="IBObjectRecord">
47584758 <int key="objectID">680</int>
4759- <reference key="object" ref="760498183"/>
4760- <reference key="parent" ref="727568098"/>
4759+ <reference key="object" ref="330248010"/>
4760+ <reference key="parent" ref="291824860"/>
47614761 </object>
47624762 <object class="IBObjectRecord">
47634763 <int key="objectID">681</int>
4764- <reference key="object" ref="672635734"/>
4765- <reference key="parent" ref="727568098"/>
4764+ <reference key="object" ref="400799124"/>
4765+ <reference key="parent" ref="291824860"/>
47664766 </object>
47674767 <object class="IBObjectRecord">
47684768 <int key="objectID">682</int>
4769- <reference key="object" ref="719198021"/>
4770- <reference key="parent" ref="727568098"/>
4769+ <reference key="object" ref="894122042"/>
4770+ <reference key="parent" ref="291824860"/>
47714771 </object>
47724772 </object>
47734773 </object>
Show on old repository browser