Skip to content

Commit d3ab403

Browse files
committed
remove incomplete functions
1 parent 91b165e commit d3ab403

File tree

7 files changed

+0
-159
lines changed

7 files changed

+0
-159
lines changed

library/src/main/jni/Android.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ LOCAL_SRC_FILES := \
7474
$(CGE_SOURCE)/filters/cgeEdgeFilter.cpp \
7575
$(CGE_SOURCE)/filters/cgeEmbossFilter.cpp \
7676
\
77-
$(CGE_SOURCE)/filters/cgeHistogramFilter.cpp \
7877
$(CGE_SOURCE)/filters/cgeWaveformFilter.cpp \
7978
\
8079
$(CGE_SOURCE)/filters/cgeCrosshatchFilter.cpp \

library/src/main/jni/cge/filters/cgeAdvancedEffects.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,6 @@ CGEBeautifyFilter* createBeautifyFilter()
137137
COMMON_FUNC(CGEBeautifyFilter);
138138
}
139139

140-
CGEHistogramFilter* createHistogramFilter()
141-
{
142-
COMMON_FUNC(CGEHistogramFilter);
143-
}
144-
145140
CGEWaveformFilter* createWaveformFilter()
146141
{
147142
COMMON_FUNC(CGEWaveformFilter);

library/src/main/jni/cge/filters/cgeAdvancedEffects.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "cgeEmbossFilter.h"
1616
#include "cgeHalftoneFilter.h"
1717
#include "cgeHazeFilter.h"
18-
#include "cgeHistogramFilter.h"
1918
#include "cgeLerpblurFilter.h"
2019
#include "cgeLiquifyFilter.h"
2120
#include "cgeMosaicBlurFilter.h"
@@ -51,7 +50,6 @@ CGESketchFilter* createSketchFilter();
5150

5251
CGEBeautifyFilter* createBeautifyFilter();
5352

54-
CGEHistogramFilter* createHistogramFilter();
5553
CGEWaveformFilter* createWaveformFilter();
5654
} // namespace CGE
5755

library/src/main/jni/cge/filters/cgeDataParsingEngine.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,26 +1093,6 @@ CGEImageFilterInterface* CGEDataParsingEngine::advancedStyleParser(const char* p
10931093
{
10941094
ADJUSTHELP_COMMON_FUNC2(pstr, CGECrosshatchFilter, setCrosshatchSpacing, setLineWidth);
10951095
}
1096-
else if (strcmp(buffer, "hist") == 0)
1097-
{
1098-
float x, y, value1, value2, r, g, b;
1099-
if (sscanf(pstr, "%f%*c%f%*c%f%*c%f%*c%f%*c%f%*c%f", &x, &y, &value1, &value2, &r, &g, &b) != 7)
1100-
{
1101-
LOG_ERROR_PARAM(pstr);
1102-
return nullptr;
1103-
}
1104-
1105-
CGEHistogramFilter* filter = createHistogramFilter();
1106-
if (filter != nullptr)
1107-
{
1108-
proc = filter;
1109-
filter->setCenter(x, y);
1110-
filter->setXValue(value1);
1111-
filter->setYValue(value2);
1112-
filter->setColor(r, g, b);
1113-
}
1114-
}
1115-
11161096
else if (strcmp(buffer, "waveform") == 0)
11171097
{
11181098
float x, y, width, height;

library/src/main/jni/cge/filters/cgeHistogramFilter.cpp

Lines changed: 0 additions & 66 deletions
This file was deleted.

library/src/main/jni/cge/filters/cgeHistogramFilter.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

library/src/main/jni/cge/filters/cgeWaveformFilter.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,6 @@
22

33
#define USING_ALPHA 1 /// 视图增加一个 80% 的半透明
44

5-
// static CGEConstString s_vshWaveform = "#version 310 es\n" CGE_SHADER_STRING_PRECISION_H(
6-
// layout(location = 0) in vec2 position;
7-
// layout(location = 0) out vec2 textureCoordinate;
8-
// void main() {
9-
// gl_Position = vec4(position, 0.0, 1.0);
10-
// textureCoordinate = (position.xy + 1.0) / 2.0;
11-
// });
12-
13-
// static CGEConstString s_fshWaveform = "#version 310 es\n" CGE_SHADER_STRING(
14-
// precision highp float;
15-
// precision highp int;
16-
// layout(location = 0) in vec2 textureCoordinate;
17-
// layout(binding = 0) uniform sampler2D inputImageTexture;
18-
// layout(rgba8ui, binding = 1) uniform writeonly highp uimage2D outputImage;
19-
// layout(location = 0) out vec4 fragColor;
20-
21-
// void main() {
22-
// fragColor = vec4(1.0);
23-
// vec4 color = texture(inputImageTexture, textureCoordinate);
24-
// float lum = dot(color.rgb, vec3(0.299, 0.587, 0.114));
25-
// ivec2 newLoc = ivec2(vec2(textureCoordinate.x, lum) * vec2(imageSize(outputImage)));
26-
// // uint newLum = uint(lum * 255.0);
27-
// imageStore(outputImage, newLoc, uvec4(255, 255, 255, 255));
28-
29-
// // TODO: 直接使用 255 来描述最亮是没有问题的。 如果要实现颜色亮度叠加. 可以考虑使用 imageAtomicAdd.
30-
// });
31-
325
static CGEConstString s_cshWaveform = "#version 310 es\n" CGE_SHADER_STRING(
336
precision highp float;
347
precision highp int;

0 commit comments

Comments
 (0)