Skip to content

Commit

Permalink
some chores in metal shaders
Browse files Browse the repository at this point in the history
  • Loading branch information
@tillt
tillt committed Mar 15, 2024
1 parent dfb2207 commit 5a124a7
Show file tree
Hide file tree
Showing 4 changed files with 300 additions and 254 deletions.
4 changes: 4 additions & 0 deletions PlayEm.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
BBDB1B402B644AD500A953F7 /* MetalWaveView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDB1B3F2B644AD500A953F7 /* MetalWaveView.m */; };
BBDB1B452B69D18A00A953F7 /* WaveTile.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDB1B442B69D18A00A953F7 /* WaveTile.m */; };
BBDBBA792BA3AF9F003A80C1 /* DragImageFileView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDBBA782BA3AF9F003A80C1 /* DragImageFileView.m */; };
BBDBBA7B2BA4B013003A80C1 /* WaveShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = BBDBBA7A2BA4B013003A80C1 /* WaveShaders.metal */; };
BBDC988A250E81D0008B19D1 /* BrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDC9889250E81D0008B19D1 /* BrowserController.m */; };
BBDC988C250E8347008B19D1 /* iTunesLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBDC988B250E8347008B19D1 /* iTunesLibrary.framework */; };
BBDEBD3D2A99417A0085E6D8 /* WaveLayerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDEBD3C2A99417A0085E6D8 /* WaveLayerDelegate.m */; };
Expand Down Expand Up @@ -203,6 +204,7 @@
BBDB1B442B69D18A00A953F7 /* WaveTile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WaveTile.m; sourceTree = "<group>"; };
BBDBBA772BA3AF9F003A80C1 /* DragImageFileView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DragImageFileView.h; sourceTree = "<group>"; };
BBDBBA782BA3AF9F003A80C1 /* DragImageFileView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DragImageFileView.m; sourceTree = "<group>"; };
BBDBBA7A2BA4B013003A80C1 /* WaveShaders.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = WaveShaders.metal; sourceTree = "<group>"; };
BBDC9888250E81CF008B19D1 /* BrowserController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BrowserController.h; sourceTree = "<group>"; };
BBDC9889250E81D0008B19D1 /* BrowserController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BrowserController.m; sourceTree = "<group>"; };
BBDC988B250E8347008B19D1 /* iTunesLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iTunesLibrary.framework; path = System/Library/Frameworks/iTunesLibrary.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -256,6 +258,7 @@
isa = PBXGroup;
children = (
BBE2846C246765A700BE9D7F /* Shaders.metal */,
BBDBBA7A2BA4B013003A80C1 /* WaveShaders.metal */,
);
path = Shaders;
sourceTree = "<group>";
Expand Down Expand Up @@ -609,6 +612,7 @@
BBC43B7328D296B800CD1080 /* AVMetadataItem+THAdditions.m in Sources */,
BB097A092921967700D33E44 /* LevelIndicatorCell.m in Sources */,
BB26B51129442E9A006EBAA7 /* AudioProcessing.m in Sources */,
BBDBBA7B2BA4B013003A80C1 /* WaveShaders.metal in Sources */,
BB2CB58724827A0900D47258 /* AudioController.m in Sources */,
BB2CB5652481A92600D47258 /* WaveWindowController.m in Sources */,
BB8A100728FF49E400FC6013 /* Scroller.m in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion PlayEm/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<key>CFBundleShortVersionString</key>
<string>1.2</string>
<key>CFBundleVersion</key>
<string>4785</string>
<string>4791</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.music</string>
<key>LSMinimumSystemVersion</key>
Expand Down
253 changes: 0 additions & 253 deletions PlayEm/Shaders/Shaders.metal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

#import "../ShaderTypes.h"
#import "../ScopeShaderTypes.h"
#import "../WaveShaderTypes.h"
#import "../Sample/VisualPair.h"

using namespace metal;
Expand Down Expand Up @@ -280,255 +279,3 @@ fragment float4 dissolveBlendFragment(

return mix(textureColor, textureColor2, uniform.mixturePercent);
}

#pragma mark -= MetalWaveView

// Fragment shader that samples a texture and outputs the sampled color.
fragment float4 waveDrawableTextureFragmentShader(TexturePipelineRasterizerData in [[ stage_in ]],
texture2d<float, access::sample> textureWave [[ texture(WaveTextureIndexSource) ]])
{
constexpr sampler simpleSampler(coord::normalized,
address::repeat,
filter::linear);
return textureWave.sample(simpleSampler, in.texcoord);
}


vertex ColorInOut waveTileVertexShader(const constant VisualPair* pairs [[ buffer(WaveBufferIndexVisualPairs) ]],
constant WaveUniforms& uniforms [[ buffer(WaveBufferIndexUniforms) ]],
unsigned int vertex_id [[ vertex_id ]])
{
float4x4 matrix = uniforms.modelViewMatrix;

const unsigned int instance = vertex_id / 4;

const float width = 2.0f / uniforms.sampleCount;

const float x = -1.0f + (instance * width);
const float halfwidth = width / 2.0f;

const float top = pairs[instance].negativeAverage - uniforms.lineWidth;
const float bottom = pairs[instance].positiveAverage + uniforms.lineWidth;
// const float top = -1.0;
// const float bottom = 1.0;

float4 startPosition = matrix * float4(x, top, 0.0f, 1.0f);
float4 endPosition = matrix * float4(x, bottom, 0.0f, 1.0f);

float4 v = endPosition - startPosition;
float2 p0 = float2(startPosition.x, startPosition.y);
float2 v0 = float2(v.x, v.y);
float2 v1 = halfwidth * normalize(v0) * float2x2(0.0f, -1.0f, 1.0f, 0.0f);
float2 v2 = halfwidth * normalize(v1) * float2x2(0.0f, -1.0f, 1.0f, 0.0f);

float2 pa = p0 + v1 + v2;
float2 pb = p0 - v1 + v2;
float2 pc = p0 + v1 + v0 - v2;
float2 pd = p0 - v1 + v0 - v2;

float2 position[] = {
float2(pa.x, pa.y),
float2(pb.x, pb.y),
float2(pc.x, pc.y),
float2(pd.x, pd.y),
};

const float2 p = position[vertex_id & 0x03];

return ColorInOut{
{ p.x, p.y, 0.0f, 1.0f },
{ uniforms.color.r, uniforms.color.g, uniforms.color.b, uniforms.color.a }
};
}

fragment float4 waveFragmentShader(ColorInOut in [[stage_in]],
constant WaveUniforms & uniforms [[ buffer(WaveBufferIndexUniforms) ]])
{
float4 out = { uniforms.color.r, uniforms.color.g, uniforms.color.b, 1.0 };
return out;
}

fragment float4 waveTileFragmentShader(ColorInOut in [[stage_in]],
texture2d<float, access::sample> inputTexture [[ texture(WaveTextureIndexSource) ]],
constant WaveUniforms & uniforms [[ buffer(WaveBufferIndexUniforms) ]])
{
return in.color;
}

vertex TexturePipelineRasterizerData waveProjectTextureVertexShader(constant WaveUniforms & uniforms [[ buffer(WaveBufferIndexUniforms) ]],
unsigned int vertex_id [[ vertex_id ]],
constant const float &tilePosition [[buffer(WaveTextureIndexPosition)]])
{
float4x4 renderedCoordinates = float4x4(float4(tilePosition, -1.0, 0.0, 1.0),
float4(tilePosition + uniforms.tileWidth, -1.0, 0.0, 1.0),
float4(tilePosition, 1.0, 0.0, 1.0),
float4(tilePosition + uniforms.tileWidth, 1.0, 0.0, 1.0));

float4x2 uvs = float4x2(float2(0.0, 1.0),
float2(1.0, 1.0),
float2(0.0, 0.0),
float2(1.0, 0.0));

TexturePipelineRasterizerData outVertex;

outVertex.position = renderedCoordinates[vertex_id];
outVertex.texcoord = uvs[vertex_id];

return outVertex;
}


// Fragment shader that samples a texture and outputs the sampled color.
fragment float4 waveProjectTextureFragmentShader(TexturePipelineRasterizerData in [[ stage_in ]],
texture2d<float, access::sample> inputTexture [[ texture(WaveTextureIndexSource) ]])
{
sampler simpleSampler;
return inputTexture.sample(simpleSampler, in.texcoord);
}

vertex TexturePipelineRasterizerData waveOverlayComposeTextureVertexShader(constant WaveUniforms & uniforms [[ buffer(WaveBufferIndexUniforms) ]],
constant const float2 &uvsMap [[ buffer(WaveTextureIndexUVSMapping) ]],
unsigned int vertex_id [[ vertex_id ]])
{
float4x4 renderedCoordinates = float4x4(float4(-1.0, -1.0, 0.0, 1.0),
float4( 1.0, -1.0, 0.0, 1.0),
float4(-1.0, 1.0, 0.0, 1.0),
float4( 1.0, 1.0, 0.0, 1.0));

float4x2 uvs = float4x2(float2(0.0, uvsMap.y),
float2(uvsMap.x, uvsMap.y),
float2(0.0, 0.0),
float2(uvsMap.x, 0.0));

TexturePipelineRasterizerData outVertex;

outVertex.position = renderedCoordinates[vertex_id];
outVertex.texcoord = uvs[vertex_id];

return outVertex;
}

fragment float4 waveOverlayComposeTextureFragmentShader(
TexturePipelineRasterizerData in [[ stage_in ]],
texture2d<float, access::sample> waveTexture [[ texture(WaveTextureIndexSource) ]])
{
constexpr sampler quadSampler(coord::normalized,
address::repeat,
filter::linear);

return waveTexture.sample(quadSampler, in.texcoord);
}

vertex TexturePipelineRasterizerData waveCurrentTimeTextureVertexShader(constant WaveUniforms & uniforms [[ buffer(WaveBufferIndexUniforms) ]],
unsigned int vertex_id [[ vertex_id ]])
{
float4x4 renderedCoordinates = float4x4(float4(uniforms.currentFrameOffset, -1.0, 0.0, 1.0),
float4( 1.0, -1.0, 0.0, 1.0),
float4(uniforms.currentFrameOffset, 1.0, 0.0, 1.0),
float4( 1.0, 1.0, 0.0, 1.0));

float4x2 uvs = float4x2(float2(uniforms.currentFrameOffset, 1.0),
float2(1.0, 1.0),
float2(uniforms.currentFrameOffset, 0.0),
float2(1.0, 0.0));

TexturePipelineRasterizerData outVertex;

outVertex.position = renderedCoordinates[vertex_id];
outVertex.texcoord = uvs[vertex_id];

return outVertex;
}

fragment float4 waveCurrentTimeTextureFragmentShader(
TexturePipelineRasterizerData in [[ stage_in ]],
texture2d<float, access::sample> waveTexture [[ texture(WaveTextureIndexSource) ]])
{
constexpr sampler quadSampler(coord::normalized,
address::repeat,
filter::linear);

float4 color = waveTexture.sample(quadSampler, in.texcoord);
float gray = 0.21 * color[0] + 0.71 * color[1] + 0.07 * color[3];
return float4(gray, gray, gray, color[3]);
}

/*
CGContextSetLineWidth(context, 7.0f);
CGContextSetStrokeColorWithColor(context, [[self.color colorWithAlphaComponent:0.40f] CGColor]);
CGFloat mid = floor(layer.bounds.size.height / 2.0);
for (unsigned int sampleIndex = 0; sampleIndex < samplePairCount; sampleIndex++) {
CGFloat top = (mid + ((data[sampleIndex].negativeAverage * layer.bounds.size.height) / 2.0)) - 2.0;
CGFloat bottom = (mid + ((data[sampleIndex].positiveAverage * layer.bounds.size.height) / 2.0)) + 2.0;
CGContextMoveToPoint(context, sampleIndex, top);
CGContextAddLineToPoint(context, sampleIndex, bottom);
CGContextStrokePath(context);
}
CGContextSetLineWidth(context, 1.5);
CGContextSetStrokeColorWithColor(context, self.color.CGColor);
for (unsigned int sampleIndex = 0; sampleIndex < samplePairCount; sampleIndex++) {
CGFloat top = (mid + ((data[sampleIndex].negativeAverage * layer.bounds.size.height) / 2.0)) - 1.0;
CGFloat bottom = (mid + ((data[sampleIndex].positiveAverage * layer.bounds.size.height) / 2.0)) + 1.0;
CGContextMoveToPoint(context, sampleIndex, top);
CGContextAddLineToPoint(context, sampleIndex, bottom);
CGContextStrokePath(context);
}
*/

/*
vertex ColorInOut waveVertexShader(constant WaveUniforms& uniforms [[ buffer(WaveBufferIndexUniforms) ]],
const constant float* samplesBuffer [[ buffer(WaveBufferIndexVisualPairs) ]],
unsigned int vid [[ vertex_id ]])
{
float4x4 matrix = uniforms.modelViewMatrix;
const unsigned int instance = vid / 4;
const float width = (2.0f / uniforms.sampleCount);
const float top = samplesBuffer[instance % uniforms.sampleCount];
const float bottom = samplesBuffer[instance % uniforms.sampleCount];
const float x = -1.0f + (instance * width);
const float space = width / 2.0f;
const float halfwidth = width - space / 2.0f;
//float x = -1.0f + (instance * (uniforms.frequencySpaceWidth + uniforms.frequencyLineWidth));
float4 startPosition = matrix * float4(x+halfwidth, -1.0f, 0.0f, 1.0f);
float4 endPosition = matrix * float4(x+halfwidth, 1.0f, 0.0f, 1.0f);
float4 v = endPosition - startPosition;
float2 p0 = float2(startPosition.x, startPosition.y);
float2 v0 = float2(v.x, v.y);
float2 v1 = halfwidth * normalize(v0) * float2x2(0.0f, -1.0f, 1.0f, 0.0f);
v1.x *= uniforms.lineAspectRatio;
float2 v2 = halfwidth * normalize(v1) * float2x2(0.0f, -1.0f, 1.0f, 0.0f);
v2.x *= uniforms.lineAspectRatio;
float2 pa = p0 + v1 + v2;
float2 pb = p0 - v1 + v2;
float2 pc = p0 + v1 + v0 - v2;
float2 pd = p0 - v1 + v0 - v2;
float2 position[] = {
float2(pa.x, pa.y),
float2(pb.x, pb.y),
float2(pc.x, pc.y),
float2(pd.x, pd.y),
};
const float2 p = position[vid & 0x03];
return ColorInOut{
{ p.x, p.y, 0.0f, 1.0f },
{ uniforms.color.r, uniforms.color.g, uniforms.color.b, uniforms.color.a * amplitude }
};
}
*/
Loading

0 comments on commit 5a124a7

Please sign in to comment.