Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/xcode 10 fix #28

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bug/xcode 10 fix #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a495c8
fix for xcode 10 adding shaders to project targety
Jun 23, 2018
fcea3a9
Update GLTFUnarchiver.swift
eduardo3150 Nov 20, 2018
00926dc
Merge pull request #1 from eduardo3150/patch-2
genui-voltron Nov 20, 2018
0f24eb0
fix some weird stuff with shaders
daametsi Nov 21, 2018
ae4aef8
comment out alpha cutoff
daametsi Nov 21, 2018
3a07244
Fixing animation appending instead of commenting out.
Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions GLTFSceneKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
objects = {

/* Begin PBXBuildFile section */
2238AE2220DDC47900E2FEA0 /* GLTFShaderModifierSurface.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD071E031F55ED1200F00567 /* GLTFShaderModifierSurface.shader */; };
2238AE2320DDC47900E2FEA0 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */ = {isa = PBXBuildFile; fileRef = 9DA74DB31FD5F54F007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader */; };
2238AE2420DDC47900E2FEA0 /* GLTFShaderModifierSurface_doubleSidedWorkaround.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD99E8071F55FBA8003D380A /* GLTFShaderModifierSurface_doubleSidedWorkaround.shader */; };
2238AE2520DDC47900E2FEA0 /* GLTFShaderModifierFragment_alphaCutoff.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD99E80A1F560099003D380A /* GLTFShaderModifierFragment_alphaCutoff.shader */; };
2238AE2620DDC47900E2FEA0 /* GLTFShaderModifierSurface.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD071E031F55ED1200F00567 /* GLTFShaderModifierSurface.shader */; };
2238AE2720DDC47900E2FEA0 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */ = {isa = PBXBuildFile; fileRef = 9DA74DB31FD5F54F007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader */; };
2238AE2820DDC47900E2FEA0 /* GLTFShaderModifierSurface_doubleSidedWorkaround.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD99E8071F55FBA8003D380A /* GLTFShaderModifierSurface_doubleSidedWorkaround.shader */; };
2238AE2920DDC47900E2FEA0 /* GLTFShaderModifierFragment_alphaCutoff.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD99E80A1F560099003D380A /* GLTFShaderModifierFragment_alphaCutoff.shader */; };
2238AE2A20DDC48700E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_doubleSidedWorkaround.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD9BFA8A1F9C2DA000542D5B /* GLTFShaderModifierSurface_pbrSpecularGlossiness_doubleSidedWorkaround.shader */; };
2238AE2B20DDC48700E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_texture_doubleSidedWorkaround.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD8804E31FA7AC91009B4584 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_texture_doubleSidedWorkaround.shader */; };
2238AE2C20DDC48700E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD9BFA7E1F9C11EA00542D5B /* GLTFShaderModifierSurface_pbrSpecularGlossiness.shader */; };
2238AE2D20DDC48800E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_doubleSidedWorkaround.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD9BFA8A1F9C2DA000542D5B /* GLTFShaderModifierSurface_pbrSpecularGlossiness_doubleSidedWorkaround.shader */; };
2238AE2E20DDC48800E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_texture_doubleSidedWorkaround.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD8804E31FA7AC91009B4584 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_texture_doubleSidedWorkaround.shader */; };
2238AE2F20DDC48800E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness.shader in Resources */ = {isa = PBXBuildFile; fileRef = DD9BFA7E1F9C11EA00542D5B /* GLTFShaderModifierSurface_pbrSpecularGlossiness.shader */; };
9DA74DB61FD5F8D9007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */ = {isa = PBXBuildFile; fileRef = 9DA74DB31FD5F54F007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader */; };
9DA74DB71FD5FBAC007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */ = {isa = PBXBuildFile; fileRef = 9DA74DB31FD5F54F007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader */; };
DD10459A1F47723D004B20CE /* GLTFTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1045991F47723D004B20CE /* GLTFTypes.swift */; };
Expand Down Expand Up @@ -571,7 +585,7 @@
};
DD83924B1F466C2D006A1CAC = {
CreatedOnToolsVersion = 9.0;
ProvisioningStyle = Manual;
ProvisioningStyle = Automatic;
};
DDB221D91F525D6E002CFA4D = {
CreatedOnToolsVersion = 9.0;
Expand Down Expand Up @@ -641,8 +655,15 @@
buildActionMask = 2147483647;
files = (
DDB221FB1F525EC9002CFA4D /* LaunchScreen.storyboard in Resources */,
2238AE2D20DDC48800E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_doubleSidedWorkaround.shader in Resources */,
2238AE2720DDC47900E2FEA0 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */,
2238AE2F20DDC48800E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness.shader in Resources */,
2238AE2620DDC47900E2FEA0 /* GLTFShaderModifierSurface.shader in Resources */,
DDB221FA1F525EC3002CFA4D /* Assets.xcassets in Resources */,
DDB221F91F525EBA002CFA4D /* art.scnassets in Resources */,
2238AE2920DDC47900E2FEA0 /* GLTFShaderModifierFragment_alphaCutoff.shader in Resources */,
2238AE2820DDC47900E2FEA0 /* GLTFShaderModifierSurface_doubleSidedWorkaround.shader in Resources */,
2238AE2E20DDC48800E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_texture_doubleSidedWorkaround.shader in Resources */,
DDB221FC1F525ECE002CFA4D /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -651,9 +672,16 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2238AE2A20DDC48700E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_doubleSidedWorkaround.shader in Resources */,
2238AE2420DDC47900E2FEA0 /* GLTFShaderModifierSurface_doubleSidedWorkaround.shader in Resources */,
DDE6FDC81F4671B900CB11D6 /* art.scnassets in Resources */,
2238AE2520DDC47900E2FEA0 /* GLTFShaderModifierFragment_alphaCutoff.shader in Resources */,
DDE6FDCA1F4671C400CB11D6 /* Assets.xcassets in Resources */,
2238AE2220DDC47900E2FEA0 /* GLTFShaderModifierSurface.shader in Resources */,
DDE6FDD61F46764500CB11D6 /* MainMenu.xib in Resources */,
2238AE2C20DDC48700E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness.shader in Resources */,
2238AE2B20DDC48700E2FEA0 /* GLTFShaderModifierSurface_pbrSpecularGlossiness_texture_doubleSidedWorkaround.shader in Resources */,
2238AE2320DDC47900E2FEA0 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1035,7 +1063,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = EF37D6UQZ9;
DEVELOPMENT_TEAM = MJLARYDQWH;
INFOPLIST_FILE = "$(SRCROOT)/Sample/iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -1053,7 +1081,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = EF37D6UQZ9;
DEVELOPMENT_TEAM = MJLARYDQWH;
INFOPLIST_FILE = "$(SRCROOT)/Sample/iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
Binary file added Sample/Common/art.scnassets/gltf/9eeb307f-6819-4645-a357-ea8cd16d1183
View file
Open in desktop
Binary file not shown.
Binary file added Sample/Common/art.scnassets/gltf/BoxAnimated.glb
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Source/Common/GLTFShaderModifierFragment_alphaCutoff.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ float alphaCutOff;

#pragma body

_output.color.a = _output.color.a >= alphaCutoff ? 1.0 : 0.0
//_output.color.a = _output.color.a >= alphaCutoff ? 1.0 : 0.0
44 changes: 27 additions & 17 deletions Source/Common/GLTFUnarchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,22 +1293,34 @@ public class GLTFUnarchiver {
group.animations = animations
group.repeatCount = .infinity

let step = animations.count
let dataLength = values.count / step
guard dataLength == keyTimes.count else {
throw GLTFUnarchiveError.DataInconsistent("loadWeightAnimationsSampler: data count mismatch: \(dataLength) != \(keyTimes.count)")
}
for i in 0..<animations.count {
var valueIndex = i
var v = [NSNumber]()
v.reserveCapacity(dataLength)
for _ in 0..<dataLength {
v.append(values[valueIndex])
valueIndex += step
if keyTimes.count == values.count {
for i in 0..<animations.count {
var v = [NSNumber]()
v.reserveCapacity(values.count)
for j in 0..<values.count {
v.append(values[j])
}
animations[i].values = v
}
} else {
let step = animations.count
let dataLength = values.count / step
// Comment out to fix animations
guard dataLength == keyTimes.count else {
throw GLTFUnarchiveError.DataInconsistent("loadWeightAnimationsSampler: data count mismatch: \(dataLength) != \(keyTimes.count)")
}
for i in 0..<animations.count {
var valueIndex = i
var v = [NSNumber]()
v.reserveCapacity(dataLength)
for _ in 0..<dataLength {
v.append(values[valueIndex])
valueIndex += step
}
animations[i].values = v
}
animations[i].values = v
}
return group
}

Expand Down Expand Up @@ -1343,13 +1355,11 @@ public class GLTFUnarchiver {
//let animation = CAKeyframeAnimation(keyPath: keyPath)
// Animation Sampler
let samplerIndex = glChannel.sampler

/*

guard samplerIndex < glAnimation.samplers.count else {
throw GLTFUnarchiveError.DataInconsistent("loadAnimation: out of index: sampler \(samplerIndex) < \(glAnimation.samplers.count)")
}
let glSampler = glAnimation.samplers[samplerIndex]
*/
var animation: CAAnimation
if keyPath == "weights" {
guard let weightPaths = weightPaths else {
Expand Down