steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

factor: cleanup IN: and paths

locals-and-roots
Doug Coleman 2016-06-22 00:26:08 -07:00
parent 6ca59c8e02
commit e80ba6ef8b
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modern/paths/paths.factor
View File

@ -3,7 +3,7 @@
USING: accessors combinators.smart io.files kernel namespaces USING: accessors combinators.smart io.files kernel namespaces
sequences sets splitting vocabs.files vocabs.hierarchy sequences sets splitting vocabs.files vocabs.hierarchy
vocabs.loader vocabs.metadata ; vocabs.loader vocabs.metadata ;
in: modern.paths IN: modern.paths
: vocabs-from ( root -- vocabs ) : vocabs-from ( root -- vocabs )
"" disk-vocabs-in-root/prefix "" disk-vocabs-in-root/prefix
@ -72,7 +72,7 @@ in: modern.paths
{ {
"specialized-arrays" "specialized-vectors" "specialized-arrays" "specialized-vectors"
"math.blas.matrices" "math.blas.vectors" "math.vectors.simd" "math.blas.matrices" "math.blas.vectors" "math.vectors.simd"
"math.vectors.simd.cords" "game.debug" "gpu.util" "gpu.effects.blur" "math.vectors.simd.cords"
} ; } ;

2
demos/bunny/cel-shaded/cel-shaded.factor
View File

@ -1,7 +1,7 @@
USING: arrays bunny.model continuations destructors kernel USING: arrays bunny.model continuations destructors kernel
multiline opengl opengl.shaders opengl.capabilities opengl.gl multiline opengl opengl.shaders opengl.capabilities opengl.gl
sequences accessors combinators ; sequences accessors combinators ;
in: bunny.cel-shaded IN: bunny.cel-shaded
CONSTANT: vertex-shader-source [[ CONSTANT: vertex-shader-source [[
varying vec3 position, normal, viewer; varying vec3 position, normal, viewer;

2
demos/bunny/outlined/outlined.factor
View File

@ -4,7 +4,7 @@ opengl.framebuffers opengl.gl opengl.textures opengl.demo-support fry
opengl.capabilities sequences ui.gadgets combinators accessors opengl.capabilities sequences ui.gadgets combinators accessors
macros locals ; macros locals ;
FROM: opengl.demo-support => rect-vertices ; FROM: opengl.demo-support => rect-vertices ;
in: bunny.outlined IN: bunny.outlined
CONSTANT: outlined-pass1-fragment-shader-main-source [[ CONSTANT: outlined-pass1-fragment-shader-main-source [[
varying vec3 normal; varying vec3 normal;

2
demos/spheres/spheres.factor
View File

@ -3,7 +3,7 @@ opengl.shaders opengl.framebuffers opengl.capabilities multiline
ui.gadgets accessors sequences ui.render ui math locals arrays ui.gadgets accessors sequences ui.render ui math locals arrays
generalizations combinators ui.gadgets.worlds generalizations combinators ui.gadgets.worlds
literals ui.pixel-formats ; literals ui.pixel-formats ;
in: spheres IN: spheres
CONSTANT: plane-vertex-shader [[ CONSTANT: plane-vertex-shader [[
varying vec3 object_position; varying vec3 object_position;

2
frameworks/game/debug/debug.factor
View File

@ -7,7 +7,7 @@ literals locals make math math.constants math.functions
math.vectors sequences specialized-arrays typed ui.text fry ; math.vectors sequences specialized-arrays typed ui.text fry ;
FROM: alien.c-types => float ; FROM: alien.c-types => float ;
SPECIALIZED-ARRAYS: float uint ; SPECIALIZED-ARRAYS: float uint ;
in: game.debug IN: game.debug
PRIVATE< PRIVATE<
! Vertex shader for debug shapes ! Vertex shader for debug shapes

2
frameworks/gpu/effects/blur/blur.factor
View File

@ -3,7 +3,7 @@
USING: arrays destructors fry gpu.framebuffers gpu.render gpu.shaders USING: arrays destructors fry gpu.framebuffers gpu.render gpu.shaders
gpu.state gpu.textures gpu.util images kernel locals math gpu.state gpu.textures gpu.util images kernel locals math
math.rectangles sequences ; math.rectangles sequences ;
in: gpu.effects.blur IN: gpu.effects.blur
GLSL-SHADER: blur-fragment-shader fragment-shader [[ GLSL-SHADER: blur-fragment-shader fragment-shader [[
uniform sampler2D texture; uniform sampler2D texture;

2
frameworks/gpu/effects/step/step.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: destructors gpu.render gpu.shaders gpu.state gpu.textures USING: destructors gpu.render gpu.shaders gpu.state gpu.textures
gpu.util images kernel locals math.rectangles ; gpu.util images kernel locals math.rectangles ;
in: gpu.effects.step IN: gpu.effects.step
GLSL-SHADER: step-fragment-shader fragment-shader [[ GLSL-SHADER: step-fragment-shader fragment-shader [[
const vec4 luminance = vec4(0.3, 0.59, 0.11, 0.0); const vec4 luminance = vec4(0.3, 0.59, 0.11, 0.0);

2
frameworks/gpu/util/util.factor
View File

@ -4,7 +4,7 @@ gpu.shaders gpu.state gpu.textures images kernel locals math
math.rectangles opengl.gl sequences specialized-arrays ; math.rectangles opengl.gl sequences specialized-arrays ;
FROM: alien.c-types => float ; FROM: alien.c-types => float ;
specialized-array: float specialized-array: float
in: gpu.util IN: gpu.util
CONSTANT: environment-cube-map-mv-matrices CONSTANT: environment-cube-map-mv-matrices
H{ H{

2
games/terrain/shaders/shaders.factor
View File

@ -1,5 +1,5 @@
USING: multiline ; USING: multiline ;
in: terrain.shaders IN: terrain.shaders
CONSTANT: sky-vertex-shader [[ CONSTANT: sky-vertex-shader [[

2
tools/model-viewer/model-viewer.factor
View File

@ -14,7 +14,7 @@ prettyprint images.tga literals ;
FROM: alien.c-types => float ; FROM: alien.c-types => float ;
specialized-array: float specialized-array: float
specialized-vector: uint specialized-vector: uint
in: model-viewer IN: model-viewer
GLSL-SHADER: obj-vertex-shader vertex-shader [[ GLSL-SHADER: obj-vertex-shader vertex-shader [[
uniform mat4 mv_matrix; uniform mat4 mv_matrix;