Skip to content

Commit d1807ae

Browse files
committed
removed temporary filter work
1 parent 1134c7a commit d1807ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+5946
-5060
lines changed

build/kiwi.js

Lines changed: 227 additions & 243 deletions
Large diffs are not rendered by default.

build/kiwi.js.orig

Lines changed: 5480 additions & 2225 deletions
Large diffs are not rendered by default.

examples/kiwi.js

Lines changed: 227 additions & 243 deletions
Large diffs are not rendered by default.

src/Kiwi.ts

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -111,45 +111,12 @@
111111
/// <reference path="render/shaders/ShaderPair.ts" />
112112
/// <reference path="render/shaders/TextureAtlasShader.ts" />
113113

114-
/// <reference path="render/filters/GLFilterManager.ts" />
115-
/// <reference path="render/filters/GLFilterRenderer.ts" />
114+
116115

117116

118117
/// <reference path="render/shaders/ShaderPair.ts" />
119118
/// <reference path="render/shaders/TextureAtlasShader.ts" />
120-
/// <reference path="render/shaders/filters/GrayScaleShader.ts" />
121-
/// <reference path="render/shaders/filters/BlurShaderX.ts" />
122-
/// <reference path="render/shaders/filters/BlurShaderY.ts" />
123-
/// <reference path="render/shaders/filters/PixelateShader.ts" />
124-
/// <reference path="render/shaders/filters/PosterizeShader.ts" />
125-
/// <reference path="render/shaders/filters/SwirlShader.ts" />
126-
/// <reference path="render/shaders/filters/DotscreenShader.ts" />
127-
/// <reference path="render/shaders/filters/HalftoneShader.ts" />
128-
/// <reference path="render/shaders/filters/HexPixelationShader.ts" />
129-
/// <reference path="render/shaders/filters/HueSaturationShader.ts" />
130-
/// <reference path="render/shaders/filters/BrightnessContrastShader.ts" />
131-
/// <reference path="render/shaders/filters/InkShader.ts" />
132-
/// <reference path="render/shaders/filters/SepiaShader.ts" />
133-
/// <reference path="render/shaders/filters/VignetteShader.ts" />
134-
/// <reference path="render/shaders/filters/ZoomBlurShader.ts" />
135-
/// <reference path="render/shaders/filters/VibranceShader.ts" />
136-
137-
/// <reference path="render/filters/Filter.ts" />
138-
/// <reference path="render/filters/GrayScaleFilter.ts" />
139-
/// <reference path="render/filters/BlurFilter.ts" />
140-
/// <reference path="render/filters/PixelateFilter.ts" />
141-
/// <reference path="render/filters/PosterizeFilter.ts" />
142-
/// <reference path="render/filters/SwirlFilter.ts" />
143-
/// <reference path="render/filters/DotscreenFilter.ts" />
144-
/// <reference path="render/filters/HalftoneFilter.ts" />
145-
/// <reference path="render/filters/HexPixelationFilter.ts" />
146-
/// <reference path="render/filters/HueSaturationFilter.ts" />
147-
/// <reference path="render/filters/BrightnessContrastFilter.ts" />
148-
/// <reference path="render/filters/InkFilter.ts" />
149-
/// <reference path="render/filters/SepiaFilter.ts" />
150-
/// <reference path="render/filters/VignetteFilter.ts" />
151-
/// <reference path="render/filters/ZoomBlurFilter.ts" />
152-
/// <reference path="render/filters/VibranceFilter.ts" />
119+
153120

154121
/// <reference path="system/Bootstrap.ts" />
155122
/// <reference path="system/Browser.ts" />

src/gameobjects/Textfield.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,6 @@ module Kiwi.GameObjects {
431431
pt3.x + t.rotPointX, pt3.y + t.rotPointY, this._canvas.width, this._canvas.height, this.alpha, //Bottom Right Point
432432
pt4.x + t.rotPointX, pt4.y + t.rotPointY, 0, this._canvas.height, this.alpha //Bottom Left Point
433433
);
434-
435-
436-
437434
//Add to the batch!
438435
(<Kiwi.Renderers.TextureAtlasRenderer>this.glRenderer).concatBatch(vertexItems);
439436
}

src/kiwi.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,15 @@
214214
<TypeScriptSourceMap>false</TypeScriptSourceMap>
215215
<TypeScriptOutFile>../build/kiwi.js</TypeScriptOutFile>
216216
<IntermediateOutputPath>C:\Users\Benj\AppData\Local\Temp\vs2B63.tmp\Debug\</IntermediateOutputPath>
217-
<IntermediateOutputPath>C:\Users\Benjamin\AppData\Local\Temp\vs6B15.tmp\Debug\</IntermediateOutputPath>
217+
<IntermediateOutputPath>C:\Users\ROSSP_~1\AppData\Local\Temp\vs4810.tmp\Debug\</IntermediateOutputPath>
218218
</PropertyGroup>
219219
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
220220
<TypeScriptTarget>ES5</TypeScriptTarget>
221221
<TypeScriptIncludeComments>true</TypeScriptIncludeComments>
222222
<TypeScriptSourceMap>false</TypeScriptSourceMap>
223223
<TypeScriptOutFile>../build/kiwi.js</TypeScriptOutFile>
224224
<IntermediateOutputPath>C:\Users\Benj\AppData\Local\Temp\vs2B63.tmp\Release\</IntermediateOutputPath>
225-
<IntermediateOutputPath>C:\Users\Benjamin\AppData\Local\Temp\vs6B15.tmp\Release\</IntermediateOutputPath>
225+
<IntermediateOutputPath>C:\Users\ROSSP_~1\AppData\Local\Temp\vs4810.tmp\Release\</IntermediateOutputPath>
226226
</PropertyGroup>
227227
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" />
228228
<PropertyGroup>

src/render/GLRenderManager.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module Kiwi.Renderers {
4444
public boot() {
4545
this._textureManager = new GLTextureManager();
4646
this._shaderManager = new Kiwi.Shaders.ShaderManager();
47-
this.filters = new Kiwi.Filters.GLFilterManager(this._game, this._shaderManager);
47+
//this.filters = new Kiwi.Filters.GLFilterManager(this._game, this._shaderManager);
4848
this._init();
4949

5050
}
@@ -84,7 +84,7 @@ module Kiwi.Renderers {
8484

8585
private _shaderManager: Kiwi.Shaders.ShaderManager;
8686

87-
public filters: Kiwi.Filters.GLFilterManager;
87+
//public filters: Kiwi.Filters.GLFilterManager;
8888

8989
/**
9090
* The stage resolution in pixels
@@ -234,6 +234,7 @@ module Kiwi.Renderers {
234234
return null; //fail
235235
}
236236

237+
/*
237238
public get filtersEnabled(): boolean {
238239
return this._filtersEnabled;
239240
}
@@ -274,13 +275,13 @@ module Kiwi.Renderers {
274275
this._game.stage.onResize.add(function (width, height) {
275276
this._stageResolution = new Float32Array([width, height]);
276277
if (this.currentRenderer) this._currentRenderer.updateStageResolution(gl, this._stageResolution);
277-
this.filters.updateFilterResolution(gl,width, height);
278+
//this.filters.updateFilterResolution(gl,width, height);
278279
gl.viewport(0, 0, width,height);
279280
},this);
280281

281-
if (this.filtersEnabled && !this.filters.isEmpty) {
282+
/* if (this.filtersEnabled && !this.filters.isEmpty) {
282283
this.filters.enableFrameBuffers(gl);
283-
}
284+
}*/
284285

285286
}
286287

@@ -355,11 +356,11 @@ module Kiwi.Renderers {
355356
this.collateBatches();
356357
this.renderBatches(gl, camera);
357358

358-
if (this._filtersEnabled && !this.filters.isEmpty) {
359+
/*if (this._filtersEnabled && !this.filters.isEmpty) {
359360
this.filters.applyFilters(gl);
360361
gl.useProgram(this._shaderManager.currentShader.shaderProgram);
361362
gl.bindTexture(gl.TEXTURE_2D, this._currentTextureAtlas.glTextureWrapper.texture);
362-
}
363+
}*/
363364
}
364365

365366
private _sequence: any[];

src/render/filters/BlurFilter.ts

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

src/render/filters/BrightnessContrastFilter.ts

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

src/render/filters/DotscreenFilter.ts

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

src/render/filters/Filter.ts

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

0 commit comments

Comments
 (0)