Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move pass to renderer #4774

Merged
merged 3 commits into from
Dec 21, 2016
Merged

Move pass to renderer #4774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43ca55b
Moved Pass from Scene to Renderer
lasalvavida Dec 20, 2016
a808df0
Merge branch 'master' of https://github.com/AnalyticalGraphicsInc/ces…
lasalvavida Dec 20, 2016
6cd33ae
Fixed pathing for specs
lasalvavida Dec 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Renderer/ComputeCommand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*global define*/
define([
'../Core/defaultValue',
'../Scene/Pass'
'./Pass'
], function(
defaultValue,
Pass) {
Expand Down
0 Source/Scene/Pass.js → Source/Renderer/Pass.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Source/Scene/BillboardCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ define([
'../Renderer/Buffer',
'../Renderer/BufferUsage',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderProgram',
'../Renderer/ShaderSource',
Expand All @@ -29,7 +30,6 @@ define([
'./BlendingState',
'./HeightReference',
'./HorizontalOrigin',
'./Pass',
'./SceneMode',
'./TextureAtlas',
'./VerticalOrigin'
Expand All @@ -53,6 +53,7 @@ define([
Buffer,
BufferUsage,
DrawCommand,
Pass,
RenderState,
ShaderProgram,
ShaderSource,
Expand All @@ -63,7 +64,6 @@ define([
BlendingState,
HeightReference,
HorizontalOrigin,
Pass,
SceneMode,
TextureAtlas,
VerticalOrigin) {
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/DepthPlane.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ define([
'../Core/PrimitiveType',
'../Renderer/BufferUsage',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderProgram',
'../Renderer/VertexArray',
'../Shaders/DepthPlaneFS',
'../Shaders/DepthPlaneVS',
'./DepthFunction',
'./Pass',
'./SceneMode'
], function(
BoundingSphere,
Expand All @@ -29,13 +29,13 @@ define([
PrimitiveType,
BufferUsage,
DrawCommand,
Pass,
RenderState,
ShaderProgram,
VertexArray,
DepthPlaneFS,
DepthPlaneVS,
DepthFunction,
Pass,
SceneMode) {
'use strict';

Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/EllipsoidPrimitive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ define([
'../Core/VertexFormat',
'../Renderer/BufferUsage',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderProgram',
'../Renderer/ShaderSource',
Expand All @@ -21,7 +22,6 @@ define([
'./BlendingState',
'./CullFace',
'./Material',
'./Pass',
'./SceneMode'
], function(
BoundingSphere,
Expand All @@ -36,6 +36,7 @@ define([
VertexFormat,
BufferUsage,
DrawCommand,
Pass,
RenderState,
ShaderProgram,
ShaderSource,
Expand All @@ -45,7 +46,6 @@ define([
BlendingState,
CullFace,
Material,
Pass,
SceneMode) {
'use strict';

Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/FrustumCommands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*global define*/
define([
'../Core/defaultValue',
'./Pass'
'../Renderer/Pass'
], function(
defaultValue,
Pass) {
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/GlobeSurfaceTileProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ define([
'../Renderer/BufferUsage',
'../Renderer/ContextLimits',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/VertexArray',
'../Scene/BlendingState',
'../Scene/DepthFunction',
'../Scene/Pass',
'../Scene/PerInstanceColorAppearance',
'../Scene/Primitive',
'./GlobeSurfaceTile',
Expand Down Expand Up @@ -73,11 +73,11 @@ define([
BufferUsage,
ContextLimits,
DrawCommand,
Pass,
RenderState,
VertexArray,
BlendingState,
DepthFunction,
Pass,
PerInstanceColorAppearance,
Primitive,
GlobeSurfaceTile,
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/GroundPrimitive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ define([
'../Core/OrientedBoundingBox',
'../Core/Rectangle',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderProgram',
'../Renderer/ShaderSource',
Expand All @@ -28,7 +29,6 @@ define([
'../ThirdParty/when',
'./BlendingState',
'./DepthFunction',
'./Pass',
'./PerInstanceColorAppearance',
'./Primitive',
'./SceneMode',
Expand All @@ -55,6 +55,7 @@ define([
OrientedBoundingBox,
Rectangle,
DrawCommand,
Pass,
RenderState,
ShaderProgram,
ShaderSource,
Expand All @@ -63,7 +64,6 @@ define([
when,
BlendingState,
DepthFunction,
Pass,
PerInstanceColorAppearance,
Primitive,
SceneMode,
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ define([
'../Renderer/Buffer',
'../Renderer/BufferUsage',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/Sampler',
'../Renderer/ShaderProgram',
Expand All @@ -59,7 +60,6 @@ define([
'./modelMaterialsCommon',
'./ModelMesh',
'./ModelNode',
'./Pass',
'./SceneMode',
'./ShadowMode'
], function(
Expand Down Expand Up @@ -100,6 +100,7 @@ define([
Buffer,
BufferUsage,
DrawCommand,
Pass,
RenderState,
Sampler,
ShaderProgram,
Expand All @@ -122,7 +123,6 @@ define([
modelMaterialsCommon,
ModelMesh,
ModelNode,
Pass,
SceneMode,
ShadowMode) {
'use strict';
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/PointPrimitiveCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ define([
'../Renderer/BufferUsage',
'../Renderer/ContextLimits',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderProgram',
'../Renderer/ShaderSource',
'../Renderer/VertexArrayFacade',
'../Shaders/PointPrimitiveCollectionFS',
'../Shaders/PointPrimitiveCollectionVS',
'./BlendingState',
'./Pass',
'./PointPrimitive',
'./SceneMode'
], function(
Expand All @@ -43,14 +43,14 @@ define([
BufferUsage,
ContextLimits,
DrawCommand,
Pass,
RenderState,
ShaderProgram,
ShaderSource,
VertexArrayFacade,
PointPrimitiveCollectionFS,
PointPrimitiveCollectionVS,
BlendingState,
Pass,
PointPrimitive,
SceneMode) {
'use strict';
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/PolylineCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ define([
'../Renderer/BufferUsage',
'../Renderer/ContextLimits',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderProgram',
'../Renderer/ShaderSource',
Expand All @@ -33,7 +34,6 @@ define([
'./BatchTable',
'./BlendingState',
'./Material',
'./Pass',
'./Polyline',
'./SceneMode'
], function(
Expand All @@ -60,6 +60,7 @@ define([
BufferUsage,
ContextLimits,
DrawCommand,
Pass,
RenderState,
ShaderProgram,
ShaderSource,
Expand All @@ -70,7 +71,6 @@ define([
BatchTable,
BlendingState,
Material,
Pass,
Polyline,
SceneMode) {
'use strict';
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/Primitive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ define([
'../Renderer/BufferUsage',
'../Renderer/ContextLimits',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderProgram',
'../Renderer/ShaderSource',
'../Renderer/VertexArray',
'../ThirdParty/when',
'./BatchTable',
'./CullFace',
'./Pass',
'./PrimitivePipeline',
'./PrimitiveState',
'./SceneMode',
Expand Down Expand Up @@ -67,14 +67,14 @@ define([
BufferUsage,
ContextLimits,
DrawCommand,
Pass,
RenderState,
ShaderProgram,
ShaderSource,
VertexArray,
when,
BatchTable,
CullFace,
Pass,
PrimitivePipeline,
PrimitiveState,
SceneMode,
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/Scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ define([
'../Renderer/Context',
'../Renderer/ContextLimits',
'../Renderer/DrawCommand',
'../Renderer/Pass',
'../Renderer/PassState',
'../Renderer/ShaderProgram',
'../Renderer/ShaderSource',
Expand All @@ -51,7 +52,6 @@ define([
'./MapMode2D',
'./OIT',
'./OrthographicFrustum',
'./Pass',
'./PerformanceDisplay',
'./PerInstanceColorAppearance',
'./PerspectiveFrustum',
Expand Down Expand Up @@ -102,6 +102,7 @@ define([
Context,
ContextLimits,
DrawCommand,
Pass,
PassState,
ShaderProgram,
ShaderSource,
Expand All @@ -118,7 +119,6 @@ define([
MapMode2D,
OIT,
OrthographicFrustum,
Pass,
PerformanceDisplay,
PerInstanceColorAppearance,
PerspectiveFrustum,
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/ShadowMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ define([
'../Renderer/CubeMap',
'../Renderer/DrawCommand',
'../Renderer/Framebuffer',
'../Renderer/Pass',
'../Renderer/PassState',
'../Renderer/PixelDatatype',
'../Renderer/Renderbuffer',
Expand All @@ -46,7 +47,6 @@ define([
'./CullingVolume',
'./DebugCameraPrimitive',
'./OrthographicFrustum',
'./Pass',
'./PerInstanceColorAppearance',
'./PerspectiveFrustum',
'./Primitive',
Expand Down Expand Up @@ -82,6 +82,7 @@ define([
CubeMap,
DrawCommand,
Framebuffer,
Pass,
PassState,
PixelDatatype,
Renderbuffer,
Expand All @@ -98,7 +99,6 @@ define([
CullingVolume,
DebugCameraPrimitive,
OrthographicFrustum,
Pass,
PerInstanceColorAppearance,
PerspectiveFrustum,
Primitive,
Expand Down
8 changes: 4 additions & 4 deletions Source/Scene/ViewportQuad.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ define([
'../Core/defined',
'../Core/destroyObject',
'../Core/DeveloperError',
'../Renderer/Pass',
'../Renderer/RenderState',
'../Renderer/ShaderSource',
'../Shaders/ViewportQuadFS',
'./BlendingState',
'./Material',
'./Pass'
'./Material'
], function(
BoundingRectangle,
Color,
defined,
destroyObject,
DeveloperError,
Pass,
RenderState,
ShaderSource,
ViewportQuadFS,
BlendingState,
Material,
Pass) {
Material) {
'use strict';

/**
Expand Down
Loading