Skip to content

Commit

Permalink
Build on XCode 15 using fixed WhirlyGlobe from muruganandham:fix/impo…
Browse files Browse the repository at this point in the history
  • Loading branch information
skarppi committed Mar 9, 2024
1 parent a1cf997 commit a746762
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
17 changes: 16 additions & 1 deletion CAV-OK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -174,6 +174,13 @@
remoteGlobalIDString = 89797E9829984CC200DCCE2E;
remoteInfo = "CAV-OK Intents";
};
89AFB4492B9C86A100279AF0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C09D666C2540BF3700FB3D39 /* WhirlyGlobeMaplyComponent.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 310573EA2863C72D00B50828;
remoteInfo = WhirlyGlobeMin;
};
C09D66432540BCC200FB3D39 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C09D66242540BCBE00FB3D39 /* Project object */;
Expand Down Expand Up @@ -551,6 +558,7 @@
isa = PBXGroup;
children = (
C09D66722540BF3700FB3D39 /* WhirlyGlobe.framework */,
89AFB44A2B9C86A100279AF0 /* WhirlyGlobe.framework */,
C09D66742540BF3700FB3D39 /* WhirlyGlobeMaplyComponentTests.xctest */,
);
name = Products;
Expand Down Expand Up @@ -888,6 +896,13 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
89AFB44A2B9C86A100279AF0 /* WhirlyGlobe.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = WhirlyGlobe.framework;
remoteRef = 89AFB4492B9C86A100279AF0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
C09D66722540BF3700FB3D39 /* WhirlyGlobe.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down
2 changes: 1 addition & 1 deletion CAVOK/Weather/Layers/HeatMap.metal
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ kernel void heatMapShader(
float hue = 0.0f;

for (int i = 5*4; i >= 0; i=i-4) {
if(value >= steps[i]) {
if(value >= steps[i] && value < steps[i+1]) {
hue = HueValue(value, steps[i], steps[i+1], steps[i+2], steps[i+3]);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/WhirlyGlobe

0 comments on commit a746762

Please sign in to comment.