Skip to content

Commit

Permalink
Start using swift for source list
Browse files Browse the repository at this point in the history
  • Loading branch information
cochrane committed May 9, 2024
1 parent a47c30f commit 249a193
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 81 deletions.
10 changes: 4 additions & 6 deletions GLLara.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
522783AD1C0B79F2002E43FD /* GLLItemMeshTextureSelectionPlaceholder.m in Sources */ = {isa = PBXBuildFile; fileRef = 522783AC1C0B79F2002E43FD /* GLLItemMeshTextureSelectionPlaceholder.m */; };
522783B01C0B7FC0002E43FD /* GLLRenderParameterSelectionPlaceholder.m in Sources */ = {isa = PBXBuildFile; fileRef = 522783AF1C0B7FBF002E43FD /* GLLRenderParameterSelectionPlaceholder.m */; };
522783B31C0B91EF002E43FD /* GLLItemMeshSelectionPlaceholder.m in Sources */ = {isa = PBXBuildFile; fileRef = 522783B21C0B91EF002E43FD /* GLLItemMeshSelectionPlaceholder.m */; };
52301E2D2087D91600B3E331 /* GLLOptionalPartController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52301E2C2087D91600B3E331 /* GLLOptionalPartController.m */; };
52301E2D2087D91600B3E331 /* GLLOptionalPartController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52301E2C2087D91600B3E331 /* GLLOptionalPartController.swift */; };
52301E302087E36100B3E331 /* GLLItemOptionalPartMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52301E2F2087E36100B3E331 /* GLLItemOptionalPartMarker.swift */; };
52301E322087E6FC00B3E331 /* GLLOptionalPartView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52301E312087E6FC00B3E331 /* GLLOptionalPartView.xib */; };
52301E352087E71400B3E331 /* GLLOptionalPartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52301E342087E71400B3E331 /* GLLOptionalPartViewController.swift */; };
Expand Down Expand Up @@ -460,8 +460,7 @@
522783AF1C0B7FBF002E43FD /* GLLRenderParameterSelectionPlaceholder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLLRenderParameterSelectionPlaceholder.m; sourceTree = "<group>"; };
522783B11C0B91EF002E43FD /* GLLItemMeshSelectionPlaceholder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLLItemMeshSelectionPlaceholder.h; sourceTree = "<group>"; };
522783B21C0B91EF002E43FD /* GLLItemMeshSelectionPlaceholder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLLItemMeshSelectionPlaceholder.m; sourceTree = "<group>"; };
52301E2B2087D91600B3E331 /* GLLOptionalPartController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GLLOptionalPartController.h; sourceTree = "<group>"; };
52301E2C2087D91600B3E331 /* GLLOptionalPartController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GLLOptionalPartController.m; sourceTree = "<group>"; };
52301E2C2087D91600B3E331 /* GLLOptionalPartController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLLOptionalPartController.swift; sourceTree = "<group>"; };
52301E2F2087E36100B3E331 /* GLLItemOptionalPartMarker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLLItemOptionalPartMarker.swift; sourceTree = "<group>"; };
52301E312087E6FC00B3E331 /* GLLOptionalPartView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GLLOptionalPartView.xib; sourceTree = "<group>"; };
52301E342087E71400B3E331 /* GLLOptionalPartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLLOptionalPartViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -997,8 +996,7 @@
528934ED16A3593400F05312 /* GLLBoneListController.m */,
523D367F16BEB29F004FAD4B /* GLLSubItemController.h */,
523D368016BEB29F004FAD4B /* GLLSubItemController.m */,
52301E2B2087D91600B3E331 /* GLLOptionalPartController.h */,
52301E2C2087D91600B3E331 /* GLLOptionalPartController.m */,
52301E2C2087D91600B3E331 /* GLLOptionalPartController.swift */,
52301E2F2087E36100B3E331 /* GLLItemOptionalPartMarker.swift */,
);
name = "Source List";
Expand Down Expand Up @@ -1844,7 +1842,7 @@
5274446827FD6F7F00E5A3FD /* GLLVertexAttribAccessorSet.swift in Sources */,
525ACD5F15F0F1A700534E7D /* GLLDocument.m in Sources */,
52FB1FD82879846A006ABC4F /* DepthBufferCheck.metal in Sources */,
52301E2D2087D91600B3E331 /* GLLOptionalPartController.m in Sources */,
52301E2D2087D91600B3E331 /* GLLOptionalPartController.swift in Sources */,
52D8DDEC2621D56F0006F0E5 /* GLLRenderParameterDescription.swift in Sources */,
525ACD8415F0F33700534E7D /* GLLModel.swift in Sources */,
5274448428031CA900E5A3FD /* GLLMeshDrawData.swift in Sources */,
Expand Down
1 change: 0 additions & 1 deletion GLLara/GLLItemController.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#import "GLLItem.h"
#import "GLLBoneListController.h"
#import "GLLMeshListController.h"
#import "GLLOptionalPartController.h"
#import "GLLSubItemController.h"
#import "NSArray+Map.h"
#import "GLLara-Swift.h"
Expand Down
2 changes: 1 addition & 1 deletion GLLara/GLLItemOptionalPartMarker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Foundation
* if the underlying items are.
*/
@objc class GLLItemOptionalPartMarker: NSObject {
@objc init(item: GLLItem) {
init(item: GLLItem) {
self.item = item
}

Expand Down
27 changes: 0 additions & 27 deletions GLLara/GLLOptionalPartController.h

This file was deleted.

46 changes: 0 additions & 46 deletions GLLara/GLLOptionalPartController.m

This file was deleted.

40 changes: 40 additions & 0 deletions GLLara/GLLOptionalPartController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//
// GLLOptionalPartController.m
// GLLara
//
// Created by Torsten Kammer on 18.04.18.
// Copyright © 2018 Torsten Kammer. All rights reserved.
//

import Cocoa

/*!
* Item controller for the optional parts of a model (if it has any). This just
* shows one single source list entry, no children; this entry shows a list of
* optional model parts in its detail view.
*/
@objc class GLLOptionalPartController: NSObject, NSOutlineViewDataSource {

@objc init(item: GLLItem, parent: AnyObject) {
representedObject = GLLItemOptionalPartMarker(item: item)
parentController = parent
}

@objc var item: GLLItem {
return representedObject.item
}
@objc weak var parentController: AnyObject?
@objc let representedObject: GLLItemOptionalPartMarker

@objc func outlineView(_ outlineView: NSOutlineView, objectValueFor tableColumn: NSTableColumn?, byItem item: Any?) -> Any? {
NSLocalizedString("Optional parts", comment: "source view optional parts")
}

@objc func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {
return false
}

@objc func outlineView(_ outlineView: NSOutlineView, numberOfChildrenOfItem item: Any?) -> Int {
return 0
}
}

0 comments on commit 249a193

Please sign in to comment.