diff --git a/Раскладка_2019-08-16.js b/Раскладка/2019-08-16.js similarity index 100% rename from Раскладка_2019-08-16.js rename to Раскладка/2019-08-16.js diff --git a/раскладки/X_shaped.layout b/раскладки/X_shaped.layout new file mode 100644 index 0000000..155b9e6 --- /dev/null +++ b/раскладки/X_shaped.layout @@ -0,0 +1,81 @@ +kmahjongg-layout-v1.0 +..121212121212....121212121212.. +..434343434343....434343434343.. +........121212....121212........ +........434343....434343........ +..........1212....1212.......... +..........4343....4343.......... +............12121212............ +............43434343............ +..............1212.............. +..............4343.............. +............12121212............ +............43434343............ +........121212....121212........ +........434343....434343........ +..121212121212....121212121212.. +..434343434343....434343434343.. +...1212121212......1212121212... +...4343434343......4343434343... +.........1212......1212......... +.........4343......4343......... +..........1212....12............ +..........4343....43............ +.............121212............. +.............434343............. +..............1212.............. +..............4343.............. +............12121212............ +............43434343............ +..........1212....1212.......... +..........4343....4343.......... +...1212121212......1212121212... +...4343434343......4343434343... +.....12121212......12121212..... +.....43434343......43434343..... +.........12..........12......... +.........43..........43......... +............12....12............ +............43....43............ +..............1212.............. +..............4343.............. +...............12............... +...............43............... +.............12..12............. +.............43..43............. +............12....12............ +............43....43............ +.....12121212......12121212..... +.....43434343......43434343..... +.......1212..........1212....... +.......4343..........4343....... +................................ +................................ +................................ +................................ +...............12............... +...............43............... +...............12............... +...............43............... +................................ +................................ +................................ +................................ +.......121212......121212....... +.......434343......434343....... +........12............12........ +........43............43........ +................................ +................................ +................................ +................................ +................................ +...............12............... +...............43............... +................................ +................................ +................................ +................................ +................................ +..........12........12.......... +..........43........43.......... diff --git a/раскладки/тест-победа.layout b/раскладки/тест-победа.layout new file mode 100644 index 0000000..65e4657 --- /dev/null +++ b/раскладки/тест-победа.layout @@ -0,0 +1,17 @@ +kmahjongg-layout-v1.0 +................................ +................................ +................................ +................................ +................................ +................................ +............121212.............. +............434343.............. +................................ +............12.................. +............43.................. +................................ +................................ +................................ +................................ +................................ diff --git a/раскладки/тест-поражение.layout b/раскладки/тест-поражение.layout new file mode 100644 index 0000000..480cfa1 --- /dev/null +++ b/раскладки/тест-поражение.layout @@ -0,0 +1,33 @@ +kmahjongg-layout-v1.0 +................................ +................................ +................................ +................................ +................................ +................................ +..........12121212121212........ +..........43434343434343........ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ +............1212121212.......... +............4343434343.......... +................................ +................................ +................................ +................................ +................................ +................................ +................................ +................................ diff --git a/текстуры/livesession-1.png b/текстуры/livesession-1.png new file mode 100644 index 0000000..3bf8731 Binary files /dev/null and b/текстуры/livesession-1.png differ diff --git a/текстуры/заглушка.png b/текстуры/заглушка.png new file mode 100644 index 0000000..47e9fcb Binary files /dev/null and b/текстуры/заглушка.png differ diff --git a/текстуры/шаблон/2019-08-16.png b/текстуры/шаблон/2019-08-16.png new file mode 100644 index 0000000..992c5de Binary files /dev/null and b/текстуры/шаблон/2019-08-16.png differ diff --git a/текстуры/шаблон/2019-08-16.xcf b/текстуры/шаблон/2019-08-16.xcf new file mode 100644 index 0000000..4f816b8 Binary files /dev/null and b/текстуры/шаблон/2019-08-16.xcf differ diff --git a/фишка/2019-08-16.blend b/фишка/2019-08-16.blend new file mode 100644 index 0000000..1b2e304 Binary files /dev/null and b/фишка/2019-08-16.blend differ diff --git a/фишка/2019-08-16.osgt b/фишка/2019-08-16.osgt new file mode 100644 index 0000000..25ef327 --- /dev/null +++ b/фишка/2019-08-16.osgt @@ -0,0 +1,149 @@ +#Ascii Scene +#Version 92 +#Generator osgexport 0.13.0 + +osg::Group { + UniqueID 23 + Name "Root" + Children 1 { + osg::MatrixTransform { + UniqueID 0 + Name "Cube" + Children 1 { + osg::Geode { + UniqueID 22 + Name "GeodeCube" + Drawables 1 { + osg::Geometry { + UniqueID 2 + Name "Cube" + PrimitiveSetList 1 { + DrawElementsUInt GL_TRIANGLES 36 { + 0 1 2 + 3 4 5 + 6 7 8 + 9 10 11 + 12 13 14 + 15 16 17 + 0 18 1 + 3 19 4 + 6 20 7 + 9 21 10 + 12 22 13 + 15 23 16 + } + } + VertexData { + Array TRUE ArrayID 0 Vec3fArray 24 { + 1.00000 1.50000 0.00000 + -1.00000 -1.50000 0.00000 + -1.00000 1.50000 0.00000 + -1.00000 1.50000 1.00000 + 1.00000 -1.50000 1.00000 + 1.00000 1.50000 1.00000 + 1.00000 1.50000 1.00000 + 1.00000 -1.50000 0.00000 + 1.00000 1.50000 0.00000 + 1.00000 -1.50000 1.00000 + -1.00000 -1.50000 0.00000 + 1.00000 -1.50000 0.00000 + -1.00000 -1.50000 0.00000 + -1.00000 1.50000 1.00000 + -1.00000 1.50000 0.00000 + 1.00000 1.50000 0.00000 + -1.00000 1.50000 1.00000 + 1.00000 1.50000 1.00000 + 1.00000 -1.50000 0.00000 + -1.00000 -1.50000 1.00000 + 1.00000 -1.50000 1.00000 + -1.00000 -1.50000 1.00000 + -1.00000 -1.50000 1.00000 + -1.00000 1.50000 0.00000 + } + Indices FALSE + Binding BIND_PER_VERTEX + Normalize 0 + } + NormalData { + Array TRUE ArrayID 1 Vec3fArray 24 { + 0.00000 -0.00000 -1.00000 + 0.00000 -0.00000 -1.00000 + 0.00000 -0.00000 -1.00000 + 0.00000 0.00000 1.00000 + 0.00000 0.00000 1.00000 + 0.00000 0.00000 1.00000 + 1.00000 0.00000 -0.00000 + 1.00000 0.00000 -0.00000 + 1.00000 0.00000 -0.00000 + -0.00000 -1.00000 -0.00000 + -0.00000 -1.00000 -0.00000 + -0.00000 -1.00000 -0.00000 + -1.00000 0.00000 -0.00000 + -1.00000 0.00000 -0.00000 + -1.00000 0.00000 -0.00000 + 0.00000 1.00000 0.00000 + 0.00000 1.00000 0.00000 + 0.00000 1.00000 0.00000 + 0.00000 0.00000 -1.00000 + 0.00000 -0.00000 1.00000 + 1.00000 -0.00000 0.00000 + -0.00000 -1.00000 0.00000 + -1.00000 0.00000 -0.00000 + 0.00000 1.00000 0.00000 + } + Indices FALSE + Binding BIND_PER_VERTEX + Normalize 0 + } + TexCoordData 2 { + Data { + Array TRUE ArrayID 2 Vec2fArray 24 { + 0.40000 0.50000 + 0.80000 0.00000 + 0.80000 0.50000 + 0.40000 0.00000 + 0.00000 0.50000 + 0.00000 0.00000 + 0.20000 0.50000 + 0.00000 1.00000 + 0.00000 0.50000 + 0.40000 0.83333 + 0.60000 0.50000 + 0.60000 0.83333 + 1.00000 0.50000 + 0.80000 0.00000 + 1.00000 0.00000 + 0.40000 0.50000 + 0.20000 0.83333 + 0.20000 0.50000 + 0.40000 0.00000 + 0.40000 0.50000 + 0.20000 1.00000 + 0.40000 0.50000 + 0.80000 0.50000 + 0.40000 0.83333 + } + Indices FALSE + Binding BIND_PER_VERTEX + Normalize 0 + } + Data { + Array TRUE ArrayID 2 + Indices FALSE + Binding BIND_PER_VERTEX + Normalize 0 + } + } + } + } + } + } + Matrix { + 1.00000 0.00000 0.00000 0.00000 + 0.00000 1.00000 0.00000 0.00000 + 0.00000 0.00000 1.00000 0.00000 + 0.00000 0.00000 0.00000 1.00000 + } + } + } +} diff --git a/шейдеры/освещение-изображение.frag b/шейдеры/освещение-изображение.frag new file mode 100644 index 0000000..9d4ac74 --- /dev/null +++ b/шейдеры/освещение-изображение.frag @@ -0,0 +1,28 @@ +#ifdef GL_ES + precision highp float; +#endif + +varying vec3 position; +varying vec3 normal; + +const vec3 lightPosition = vec3(10, 20, 10); + +varying vec2 texCoord; +uniform sampler2D image; + +float lambertianReflectanceStrength(vec3 position, vec3 lightPosition) +{ + vec3 lightDirection = normalize(lightPosition - position); + // Light flux direction. + float strength = dot(normal, lightDirection); + float diffuse = max(strength, 0.2); + + return diffuse; +} + +void main() +{ + vec3 texColor = texture2D(image, texCoord).rgb; + vec3 finalColor = texColor * lambertianReflectanceStrength(position, lightPosition); + gl_FragColor = vec4(finalColor, 1.0); +} diff --git a/шейдеры/освещение-изображение.vert b/шейдеры/освещение-изображение.vert new file mode 100644 index 0000000..163f8bd --- /dev/null +++ b/шейдеры/освещение-изображение.vert @@ -0,0 +1,16 @@ +varying vec3 position; +varying vec3 normal; +varying vec2 texCoord; + +void main() +{ + // Translate vertex coordinates from model/object space to screen one. + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; + + // Pass vertex coordinates and normal into camera/eye space. + position = vec3(gl_ModelViewMatrix * gl_Vertex); + normal = vec3(gl_ModelViewMatrix * vec4(gl_Normal, 0.0)); + + // Pass texture coordinate. + texCoord = gl_MultiTexCoord0.xy; +}