diff --git a/Source/Renderer/ComputeCommand.js b/Source/Renderer/ComputeCommand.js index 2e7678276f76..8d0231c673bc 100644 --- a/Source/Renderer/ComputeCommand.js +++ b/Source/Renderer/ComputeCommand.js @@ -1,7 +1,7 @@ /*global define*/ define([ '../Core/defaultValue', - '../Scene/Pass' + './Pass' ], function( defaultValue, Pass) { diff --git a/Source/Scene/Pass.js b/Source/Renderer/Pass.js similarity index 100% rename from Source/Scene/Pass.js rename to Source/Renderer/Pass.js diff --git a/Source/Scene/BillboardCollection.js b/Source/Scene/BillboardCollection.js index 0e29e5d9af74..f20fb3afc4af 100644 --- a/Source/Scene/BillboardCollection.js +++ b/Source/Scene/BillboardCollection.js @@ -19,6 +19,7 @@ define([ '../Renderer/Buffer', '../Renderer/BufferUsage', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/RenderState', '../Renderer/ShaderProgram', '../Renderer/ShaderSource', @@ -29,7 +30,6 @@ define([ './BlendingState', './HeightReference', './HorizontalOrigin', - './Pass', './SceneMode', './TextureAtlas', './VerticalOrigin' @@ -53,6 +53,7 @@ define([ Buffer, BufferUsage, DrawCommand, + Pass, RenderState, ShaderProgram, ShaderSource, @@ -63,7 +64,6 @@ define([ BlendingState, HeightReference, HorizontalOrigin, - Pass, SceneMode, TextureAtlas, VerticalOrigin) { diff --git a/Source/Scene/DepthPlane.js b/Source/Scene/DepthPlane.js index 71f81e70d14f..78e5808e05b1 100644 --- a/Source/Scene/DepthPlane.js +++ b/Source/Scene/DepthPlane.js @@ -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, @@ -29,13 +29,13 @@ define([ PrimitiveType, BufferUsage, DrawCommand, + Pass, RenderState, ShaderProgram, VertexArray, DepthPlaneFS, DepthPlaneVS, DepthFunction, - Pass, SceneMode) { 'use strict'; diff --git a/Source/Scene/EllipsoidPrimitive.js b/Source/Scene/EllipsoidPrimitive.js index 732d41f74d33..2bdab578c846 100644 --- a/Source/Scene/EllipsoidPrimitive.js +++ b/Source/Scene/EllipsoidPrimitive.js @@ -12,6 +12,7 @@ define([ '../Core/VertexFormat', '../Renderer/BufferUsage', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/RenderState', '../Renderer/ShaderProgram', '../Renderer/ShaderSource', @@ -21,7 +22,6 @@ define([ './BlendingState', './CullFace', './Material', - './Pass', './SceneMode' ], function( BoundingSphere, @@ -36,6 +36,7 @@ define([ VertexFormat, BufferUsage, DrawCommand, + Pass, RenderState, ShaderProgram, ShaderSource, @@ -45,7 +46,6 @@ define([ BlendingState, CullFace, Material, - Pass, SceneMode) { 'use strict'; diff --git a/Source/Scene/FrustumCommands.js b/Source/Scene/FrustumCommands.js index 2d33d09d338a..fe5828910791 100644 --- a/Source/Scene/FrustumCommands.js +++ b/Source/Scene/FrustumCommands.js @@ -1,7 +1,7 @@ /*global define*/ define([ '../Core/defaultValue', - './Pass' + '../Renderer/Pass' ], function( defaultValue, Pass) { diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js index 20f3a40ecb2f..54bf1c306e0a 100644 --- a/Source/Scene/GlobeSurfaceTileProvider.js +++ b/Source/Scene/GlobeSurfaceTileProvider.js @@ -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', @@ -73,11 +73,11 @@ define([ BufferUsage, ContextLimits, DrawCommand, + Pass, RenderState, VertexArray, BlendingState, DepthFunction, - Pass, PerInstanceColorAppearance, Primitive, GlobeSurfaceTile, diff --git a/Source/Scene/GroundPrimitive.js b/Source/Scene/GroundPrimitive.js index cfcea5ec94e3..9939662eea12 100644 --- a/Source/Scene/GroundPrimitive.js +++ b/Source/Scene/GroundPrimitive.js @@ -20,6 +20,7 @@ define([ '../Core/OrientedBoundingBox', '../Core/Rectangle', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/RenderState', '../Renderer/ShaderProgram', '../Renderer/ShaderSource', @@ -28,7 +29,6 @@ define([ '../ThirdParty/when', './BlendingState', './DepthFunction', - './Pass', './PerInstanceColorAppearance', './Primitive', './SceneMode', @@ -55,6 +55,7 @@ define([ OrientedBoundingBox, Rectangle, DrawCommand, + Pass, RenderState, ShaderProgram, ShaderSource, @@ -63,7 +64,6 @@ define([ when, BlendingState, DepthFunction, - Pass, PerInstanceColorAppearance, Primitive, SceneMode, diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js index 7a2ca8bd8811..0447bbf29ec1 100644 --- a/Source/Scene/Model.js +++ b/Source/Scene/Model.js @@ -37,6 +37,7 @@ define([ '../Renderer/Buffer', '../Renderer/BufferUsage', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/RenderState', '../Renderer/Sampler', '../Renderer/ShaderProgram', @@ -59,7 +60,6 @@ define([ './modelMaterialsCommon', './ModelMesh', './ModelNode', - './Pass', './SceneMode', './ShadowMode' ], function( @@ -100,6 +100,7 @@ define([ Buffer, BufferUsage, DrawCommand, + Pass, RenderState, Sampler, ShaderProgram, @@ -122,7 +123,6 @@ define([ modelMaterialsCommon, ModelMesh, ModelNode, - Pass, SceneMode, ShadowMode) { 'use strict'; diff --git a/Source/Scene/PointPrimitiveCollection.js b/Source/Scene/PointPrimitiveCollection.js index 78820c715716..52f0b5f42a80 100644 --- a/Source/Scene/PointPrimitiveCollection.js +++ b/Source/Scene/PointPrimitiveCollection.js @@ -16,6 +16,7 @@ define([ '../Renderer/BufferUsage', '../Renderer/ContextLimits', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/RenderState', '../Renderer/ShaderProgram', '../Renderer/ShaderSource', @@ -23,7 +24,6 @@ define([ '../Shaders/PointPrimitiveCollectionFS', '../Shaders/PointPrimitiveCollectionVS', './BlendingState', - './Pass', './PointPrimitive', './SceneMode' ], function( @@ -43,6 +43,7 @@ define([ BufferUsage, ContextLimits, DrawCommand, + Pass, RenderState, ShaderProgram, ShaderSource, @@ -50,7 +51,6 @@ define([ PointPrimitiveCollectionFS, PointPrimitiveCollectionVS, BlendingState, - Pass, PointPrimitive, SceneMode) { 'use strict'; diff --git a/Source/Scene/PolylineCollection.js b/Source/Scene/PolylineCollection.js index 3e24d43528c3..4d491863be01 100644 --- a/Source/Scene/PolylineCollection.js +++ b/Source/Scene/PolylineCollection.js @@ -23,6 +23,7 @@ define([ '../Renderer/BufferUsage', '../Renderer/ContextLimits', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/RenderState', '../Renderer/ShaderProgram', '../Renderer/ShaderSource', @@ -33,7 +34,6 @@ define([ './BatchTable', './BlendingState', './Material', - './Pass', './Polyline', './SceneMode' ], function( @@ -60,6 +60,7 @@ define([ BufferUsage, ContextLimits, DrawCommand, + Pass, RenderState, ShaderProgram, ShaderSource, @@ -70,7 +71,6 @@ define([ BatchTable, BlendingState, Material, - Pass, Polyline, SceneMode) { 'use strict'; diff --git a/Source/Scene/Primitive.js b/Source/Scene/Primitive.js index dd05d4749feb..23b812e41b38 100644 --- a/Source/Scene/Primitive.js +++ b/Source/Scene/Primitive.js @@ -27,6 +27,7 @@ define([ '../Renderer/BufferUsage', '../Renderer/ContextLimits', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/RenderState', '../Renderer/ShaderProgram', '../Renderer/ShaderSource', @@ -34,7 +35,6 @@ define([ '../ThirdParty/when', './BatchTable', './CullFace', - './Pass', './PrimitivePipeline', './PrimitiveState', './SceneMode', @@ -67,6 +67,7 @@ define([ BufferUsage, ContextLimits, DrawCommand, + Pass, RenderState, ShaderProgram, ShaderSource, @@ -74,7 +75,6 @@ define([ when, BatchTable, CullFace, - Pass, PrimitivePipeline, PrimitiveState, SceneMode, diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js index e8e5840d0464..221e9d5869dd 100644 --- a/Source/Scene/Scene.js +++ b/Source/Scene/Scene.js @@ -35,6 +35,7 @@ define([ '../Renderer/Context', '../Renderer/ContextLimits', '../Renderer/DrawCommand', + '../Renderer/Pass', '../Renderer/PassState', '../Renderer/ShaderProgram', '../Renderer/ShaderSource', @@ -51,7 +52,6 @@ define([ './MapMode2D', './OIT', './OrthographicFrustum', - './Pass', './PerformanceDisplay', './PerInstanceColorAppearance', './PerspectiveFrustum', @@ -102,6 +102,7 @@ define([ Context, ContextLimits, DrawCommand, + Pass, PassState, ShaderProgram, ShaderSource, @@ -118,7 +119,6 @@ define([ MapMode2D, OIT, OrthographicFrustum, - Pass, PerformanceDisplay, PerInstanceColorAppearance, PerspectiveFrustum, diff --git a/Source/Scene/ShadowMap.js b/Source/Scene/ShadowMap.js index 594bc3346381..cce66085ebdb 100644 --- a/Source/Scene/ShadowMap.js +++ b/Source/Scene/ShadowMap.js @@ -30,6 +30,7 @@ define([ '../Renderer/CubeMap', '../Renderer/DrawCommand', '../Renderer/Framebuffer', + '../Renderer/Pass', '../Renderer/PassState', '../Renderer/PixelDatatype', '../Renderer/Renderbuffer', @@ -46,7 +47,6 @@ define([ './CullingVolume', './DebugCameraPrimitive', './OrthographicFrustum', - './Pass', './PerInstanceColorAppearance', './PerspectiveFrustum', './Primitive', @@ -82,6 +82,7 @@ define([ CubeMap, DrawCommand, Framebuffer, + Pass, PassState, PixelDatatype, Renderbuffer, @@ -98,7 +99,6 @@ define([ CullingVolume, DebugCameraPrimitive, OrthographicFrustum, - Pass, PerInstanceColorAppearance, PerspectiveFrustum, Primitive, diff --git a/Source/Scene/ViewportQuad.js b/Source/Scene/ViewportQuad.js index 5d26694eb94b..b8dbeb2269f9 100644 --- a/Source/Scene/ViewportQuad.js +++ b/Source/Scene/ViewportQuad.js @@ -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'; /** diff --git a/Specs/Renderer/AutomaticUniformSpec.js b/Specs/Renderer/AutomaticUniformSpec.js index b00f04ae2779..8e4c5010ee30 100644 --- a/Specs/Renderer/AutomaticUniformSpec.js +++ b/Specs/Renderer/AutomaticUniformSpec.js @@ -4,9 +4,9 @@ defineSuite([ 'Core/Cartesian3', 'Core/defaultValue', 'Core/Matrix4', + 'Renderer/Pass', 'Renderer/Texture', 'Scene/OrthographicFrustum', - 'Scene/Pass', 'Scene/SceneMode', 'Specs/createCamera', 'Specs/createContext', @@ -16,9 +16,9 @@ defineSuite([ Cartesian3, defaultValue, Matrix4, + Pass, Texture, OrthographicFrustum, - Pass, SceneMode, createCamera, createContext, diff --git a/Specs/Renderer/DrawCommandSpec.js b/Specs/Renderer/DrawCommandSpec.js index b15ff6c9b772..a066f2cf8e06 100644 --- a/Specs/Renderer/DrawCommandSpec.js +++ b/Specs/Renderer/DrawCommandSpec.js @@ -1,11 +1,11 @@ /*global defineSuite*/ defineSuite([ - 'Renderer/DrawCommand', 'Core/PrimitiveType', - 'Scene/Pass' + 'Renderer/DrawCommand', + 'Renderer/Pass' ], function( - DrawCommand, PrimitiveType, + DrawCommand, Pass) { 'use strict'; diff --git a/Specs/Scene/FrustumCommandsSpec.js b/Specs/Scene/FrustumCommandsSpec.js index 57bc636a5a0b..e3f5a7eb9afe 100644 --- a/Specs/Scene/FrustumCommandsSpec.js +++ b/Specs/Scene/FrustumCommandsSpec.js @@ -1,10 +1,10 @@ /*global defineSuite*/ defineSuite([ - 'Scene/FrustumCommands', - 'Scene/Pass' + 'Renderer/Pass', + 'Scene/FrustumCommands' ], function( - FrustumCommands, - Pass) { + Pass, + FrustumCommands) { 'use strict'; it('constructs without arguments', function() { diff --git a/Specs/Scene/GroundPrimitiveSpec.js b/Specs/Scene/GroundPrimitiveSpec.js index a64916d714dc..4b46d3a7a17a 100644 --- a/Specs/Scene/GroundPrimitiveSpec.js +++ b/Specs/Scene/GroundPrimitiveSpec.js @@ -1,6 +1,5 @@ /*global defineSuite*/ defineSuite([ - 'Scene/GroundPrimitive', 'Core/Color', 'Core/ColorGeometryInstanceAttribute', 'Core/destroyObject', @@ -13,13 +12,13 @@ defineSuite([ 'Core/Rectangle', 'Core/RectangleGeometry', 'Core/ShowGeometryInstanceAttribute', - 'Scene/Pass', + 'Renderer/Pass', + 'Scene/GroundPrimitive', 'Scene/PerInstanceColorAppearance', 'Scene/Primitive', 'Specs/createScene', 'Specs/pollToPromise' ], function( - GroundPrimitive, Color, ColorGeometryInstanceAttribute, destroyObject, @@ -33,6 +32,7 @@ defineSuite([ RectangleGeometry, ShowGeometryInstanceAttribute, Pass, + GroundPrimitive, PerInstanceColorAppearance, Primitive, createScene, diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js index b9ebd649193f..c9908b0fa5c3 100644 --- a/Specs/Scene/ModelSpec.js +++ b/Specs/Scene/ModelSpec.js @@ -24,11 +24,11 @@ defineSuite([ 'Core/PrimitiveType', 'Core/Transforms', 'Core/WebGLConstants', + 'Renderer/Pass', 'Renderer/RenderState', 'Renderer/ShaderSource', 'Scene/ColorBlendMode', 'Scene/HeightReference', - 'Scene/Pass', 'Scene/ModelAnimationLoop', 'Specs/createScene', 'Specs/pollToPromise', @@ -58,11 +58,11 @@ defineSuite([ PrimitiveType, Transforms, WebGLConstants, + Pass, RenderState, ShaderSource, ColorBlendMode, HeightReference, - Pass, ModelAnimationLoop, createScene, pollToPromise, diff --git a/Specs/Scene/MultifrustumSpec.js b/Specs/Scene/MultifrustumSpec.js index 7b0ff8a8f5c9..dfa07c5481fc 100644 --- a/Specs/Scene/MultifrustumSpec.js +++ b/Specs/Scene/MultifrustumSpec.js @@ -14,6 +14,7 @@ defineSuite([ 'Core/Matrix4', 'Renderer/BufferUsage', 'Renderer/DrawCommand', + 'Renderer/Pass', 'Renderer/RenderState', 'Renderer/Sampler', 'Renderer/ShaderProgram', @@ -22,7 +23,6 @@ defineSuite([ 'Renderer/VertexArray', 'Scene/BillboardCollection', 'Scene/BlendingState', - 'Scene/Pass', 'Scene/TextureAtlas', 'Specs/createScene', 'ThirdParty/when' @@ -41,6 +41,7 @@ defineSuite([ Matrix4, BufferUsage, DrawCommand, + Pass, RenderState, Sampler, ShaderProgram, @@ -49,7 +50,6 @@ defineSuite([ VertexArray, BillboardCollection, BlendingState, - Pass, TextureAtlas, createScene, when) { diff --git a/Specs/Scene/SceneSpec.js b/Specs/Scene/SceneSpec.js index a4729f3cb711..b18de90eb279 100644 --- a/Specs/Scene/SceneSpec.js +++ b/Specs/Scene/SceneSpec.js @@ -16,6 +16,7 @@ defineSuite([ 'Core/WebMercatorProjection', 'Renderer/DrawCommand', 'Renderer/Framebuffer', + 'Renderer/Pass', 'Renderer/PixelDatatype', 'Renderer/ShaderProgram', 'Renderer/Texture', @@ -23,7 +24,6 @@ defineSuite([ 'Scene/EllipsoidSurfaceAppearance', 'Scene/FrameState', 'Scene/Globe', - 'Scene/Pass', 'Scene/Primitive', 'Scene/PrimitiveCollection', 'Scene/Scene', @@ -51,6 +51,7 @@ defineSuite([ WebMercatorProjection, DrawCommand, Framebuffer, + Pass, PixelDatatype, ShaderProgram, Texture, @@ -58,7 +59,6 @@ defineSuite([ EllipsoidSurfaceAppearance, FrameState, Globe, - Pass, Primitive, PrimitiveCollection, Scene, diff --git a/Specs/pick.js b/Specs/pick.js index 061d47dde3d4..3af52acd40bd 100644 --- a/Specs/pick.js +++ b/Specs/pick.js @@ -4,17 +4,17 @@ define([ 'Core/Color', 'Core/defined', 'Renderer/ClearCommand', + 'Renderer/Pass', 'Scene/CreditDisplay', - 'Scene/FrameState', - 'Scene/Pass' + 'Scene/FrameState' ], function( BoundingRectangle, Color, defined, ClearCommand, + Pass, CreditDisplay, - FrameState, - Pass) { + FrameState) { 'use strict'; function executeCommands(context, passState, commands) { diff --git a/Specs/render.js b/Specs/render.js index ed2caf3d0346..d239ed626176 100644 --- a/Specs/render.js +++ b/Specs/render.js @@ -2,7 +2,7 @@ define([ 'Core/defined', 'Core/Intersect', - 'Scene/Pass', + 'Renderer/Pass', 'Scene/SceneMode' ], function( defined,