diff --git a/core/modern/paths/paths.factor b/core/modern/paths/paths.factor index 7dbfb55dd8..01d4f77d4d 100644 --- a/core/modern/paths/paths.factor +++ b/core/modern/paths/paths.factor @@ -3,7 +3,7 @@ USING: accessors combinators.smart io.files kernel namespaces sequences sets splitting vocabs.files vocabs.hierarchy vocabs.loader vocabs.metadata ; -in: modern.paths +IN: modern.paths : vocabs-from ( root -- vocabs ) "" disk-vocabs-in-root/prefix @@ -72,7 +72,7 @@ in: modern.paths { "specialized-arrays" "specialized-vectors" "math.blas.matrices" "math.blas.vectors" "math.vectors.simd" - "math.vectors.simd.cords" "game.debug" "gpu.util" "gpu.effects.blur" + "math.vectors.simd.cords" } ; diff --git a/demos/bunny/cel-shaded/cel-shaded.factor b/demos/bunny/cel-shaded/cel-shaded.factor index 20b1e1e660..19ac4ad305 100644 --- a/demos/bunny/cel-shaded/cel-shaded.factor +++ b/demos/bunny/cel-shaded/cel-shaded.factor @@ -1,7 +1,7 @@ USING: arrays bunny.model continuations destructors kernel multiline opengl opengl.shaders opengl.capabilities opengl.gl sequences accessors combinators ; -in: bunny.cel-shaded +IN: bunny.cel-shaded CONSTANT: vertex-shader-source [[ varying vec3 position, normal, viewer; diff --git a/demos/bunny/outlined/outlined.factor b/demos/bunny/outlined/outlined.factor index f4cbef7670..622b77d5da 100644 --- a/demos/bunny/outlined/outlined.factor +++ b/demos/bunny/outlined/outlined.factor @@ -4,7 +4,7 @@ opengl.framebuffers opengl.gl opengl.textures opengl.demo-support fry opengl.capabilities sequences ui.gadgets combinators accessors macros locals ; FROM: opengl.demo-support => rect-vertices ; -in: bunny.outlined +IN: bunny.outlined CONSTANT: outlined-pass1-fragment-shader-main-source [[ varying vec3 normal; diff --git a/demos/spheres/spheres.factor b/demos/spheres/spheres.factor index b7659026b2..404b18c543 100644 --- a/demos/spheres/spheres.factor +++ b/demos/spheres/spheres.factor @@ -3,7 +3,7 @@ opengl.shaders opengl.framebuffers opengl.capabilities multiline ui.gadgets accessors sequences ui.render ui math locals arrays generalizations combinators ui.gadgets.worlds literals ui.pixel-formats ; -in: spheres +IN: spheres CONSTANT: plane-vertex-shader [[ varying vec3 object_position; diff --git a/frameworks/game/debug/debug.factor b/frameworks/game/debug/debug.factor index 9bb4ac1838..04b44a3f7b 100644 --- a/frameworks/game/debug/debug.factor +++ b/frameworks/game/debug/debug.factor @@ -7,7 +7,7 @@ literals locals make math math.constants math.functions math.vectors sequences specialized-arrays typed ui.text fry ; FROM: alien.c-types => float ; SPECIALIZED-ARRAYS: float uint ; -in: game.debug +IN: game.debug PRIVATE< ! Vertex shader for debug shapes diff --git a/frameworks/gpu/effects/blur/blur.factor b/frameworks/gpu/effects/blur/blur.factor index b1e4419ec0..73a0906edb 100644 --- a/frameworks/gpu/effects/blur/blur.factor +++ b/frameworks/gpu/effects/blur/blur.factor @@ -3,7 +3,7 @@ USING: arrays destructors fry gpu.framebuffers gpu.render gpu.shaders gpu.state gpu.textures gpu.util images kernel locals math math.rectangles sequences ; -in: gpu.effects.blur +IN: gpu.effects.blur GLSL-SHADER: blur-fragment-shader fragment-shader [[ uniform sampler2D texture; diff --git a/frameworks/gpu/effects/step/step.factor b/frameworks/gpu/effects/step/step.factor index d4f6aee18d..911175b7b0 100644 --- a/frameworks/gpu/effects/step/step.factor +++ b/frameworks/gpu/effects/step/step.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: destructors gpu.render gpu.shaders gpu.state gpu.textures gpu.util images kernel locals math.rectangles ; -in: gpu.effects.step +IN: gpu.effects.step GLSL-SHADER: step-fragment-shader fragment-shader [[ const vec4 luminance = vec4(0.3, 0.59, 0.11, 0.0); diff --git a/frameworks/gpu/util/util.factor b/frameworks/gpu/util/util.factor index e723227168..daea37911a 100644 --- a/frameworks/gpu/util/util.factor +++ b/frameworks/gpu/util/util.factor @@ -4,7 +4,7 @@ gpu.shaders gpu.state gpu.textures images kernel locals math math.rectangles opengl.gl sequences specialized-arrays ; FROM: alien.c-types => float ; specialized-array: float -in: gpu.util +IN: gpu.util CONSTANT: environment-cube-map-mv-matrices H{ diff --git a/games/terrain/shaders/shaders.factor b/games/terrain/shaders/shaders.factor index 3e8fb07c5f..0e37f68f97 100644 --- a/games/terrain/shaders/shaders.factor +++ b/games/terrain/shaders/shaders.factor @@ -1,5 +1,5 @@ USING: multiline ; -in: terrain.shaders +IN: terrain.shaders CONSTANT: sky-vertex-shader [[ diff --git a/tools/model-viewer/model-viewer.factor b/tools/model-viewer/model-viewer.factor index 6c6a3f3485..305d0c9c47 100644 --- a/tools/model-viewer/model-viewer.factor +++ b/tools/model-viewer/model-viewer.factor @@ -14,7 +14,7 @@ prettyprint images.tga literals ; FROM: alien.c-types => float ; specialized-array: float specialized-vector: uint -in: model-viewer +IN: model-viewer GLSL-SHADER: obj-vertex-shader vertex-shader [[ uniform mat4 mv_matrix;