-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Experiment: Using combine and objectWillChange instead of key path observation. I think I like it.
- Loading branch information
Showing
14 changed files
with
81 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // | ||
| // GLLColorRenderParameter.m | ||
| // GLLara | ||
| // | ||
| // Created by Torsten Kammer on 12.09.12. | ||
| // Copyright (c) 2012 Torsten Kammer. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import CoreData | ||
|
|
||
| /** | ||
| * @abstract A render parameter whose value is a color. | ||
| * @discussion These paramaters are new additions; XNALara has only float | ||
| * parameters. | ||
| */ | ||
| @objc(GLLColorRenderParameter) | ||
| public class GLLColorRenderParameter: GLLRenderParameter { | ||
| @NSManaged public var value: NSColor! | ||
|
|
||
| var colorValue: vector_float4 { | ||
| return value.rgbaComponents128Bit | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
20 changes: 8 additions & 12 deletions
20
GLLara/GLLFloatRenderParameter.h → GLLara/GLLFloatRenderParameter.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,20 @@ | ||
| // | ||
| // GLLFloatRenderParameter.h | ||
| // GLLFloatRenderParameter.swift | ||
| // GLLara | ||
| // | ||
| // Created by Torsten Kammer on 12.09.12. | ||
| // Copyright (c) 2012 Torsten Kammer. All rights reserved. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import <CoreData/CoreData.h> | ||
| #import "GLLRenderParameter.h" | ||
| import Foundation | ||
| import CoreData | ||
|
|
||
| /*! | ||
| /** | ||
| * @abstract A render parameter whose value is a single real number. | ||
| * @discussion This includes all XNALara-specific render parameters, but also | ||
| * a few added myself. | ||
| */ | ||
| @interface GLLFloatRenderParameter : GLLRenderParameter | ||
|
|
||
| @property (nonatomic) float value; | ||
|
|
||
| @property (nonatomic, readonly) NSData *uniformValue; | ||
|
|
||
| @end | ||
| @objc(GLLFloatRenderParameter) | ||
| public class GLLFloatRenderParameter: GLLRenderParameter { | ||
| @NSManaged public var value: Float | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.