Skip to content

Commit

Permalink
re-introduced passes
Browse files Browse the repository at this point in the history
introduced the IRendererPool interface
  • Loading branch information
rob-bateman committed Jan 23, 2015
1 parent c60ec12 commit b8427a2
Show file tree
Hide file tree
Showing 38 changed files with 439 additions and 235 deletions.
2 changes: 1 addition & 1 deletion lib/base/IRenderableOwner.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/base/IRenderableOwner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import IAsset = require("awayjs-core/lib/library/IAsset");
import IAnimator = require("awayjs-display/lib/animators/IAnimator");
import MaterialBase = require("awayjs-display/lib/materials/MaterialBase");
import IRenderable = require("awayjs-display/lib/pool/IRenderable");
import IRenderer = require("awayjs-display/lib/render/IRenderer");
import IRendererPool = require("awayjs-display/lib/pool/IRendererPool");


/**
Expand Down Expand Up @@ -44,7 +44,7 @@ interface IRenderableOwner extends IAsset
* @param renderer
* @private
*/
_iCollectRenderable(renderer:IRenderer)
_iCollectRenderable(rendererPool:IRendererPool)
}

export = IRenderableOwner;
6 changes: 3 additions & 3 deletions lib/base/LineSubMesh.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/base/LineSubMesh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import AssetType = require("awayjs-core/lib/library/AssetType");
import ISubMesh = require("awayjs-display/lib/base/ISubMesh");
import LineSubGeometry = require("awayjs-display/lib/base/LineSubGeometry");
import SubMeshBase = require("awayjs-display/lib/base/SubMeshBase");
import IRenderer = require("awayjs-display/lib/render/IRenderer");
import IRendererPool = require("awayjs-display/lib/pool/IRendererPool");
import Mesh = require("awayjs-display/lib/entities/Mesh");
import MaterialBase = require("awayjs-display/lib/materials/MaterialBase");

Expand Down Expand Up @@ -61,9 +61,9 @@ class LineSubMesh extends SubMeshBase implements ISubMesh
super.dispose();
}

public _iCollectRenderable(renderer:IRenderer)
public _iCollectRenderable(rendererPool:IRendererPool)
{
renderer.applyLineSubMesh(this);
rendererPool.applyLineSubMesh(this);
}
}

Expand Down
Loading

0 comments on commit b8427a2

Please sign in to comment.