FHWS/YASMIN
Archived
3
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

current revision

Browse Source
This commit is contained in:
FrankE
2016-09-28 12:16:45 +02:00
parent 075d8bb633
commit d47322e73b
90 changed files with 8228 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/gl/fragmentColorPoint.glsl
View File

@@ -18,7 +18,7 @@ void main() {
#ifdef GL_ES
// set point size
gl_PointSize = 3.0;
//gl_PointSize = 3.0;
#endif

7
res/gl/fragmentTex.glsl
View File

@@ -9,6 +9,7 @@ uniform vec3 lightWorldPos;
uniform sampler2D texDiffuse;
uniform sampler2D texNormalMap;
uniform float alpha;
// interpolated values
varying vec3 v_WorldPos;
@@ -55,12 +56,12 @@ void main() {
// Set fragment color from texture
vec4 finalColor =
ambient * 0.05 +
diffuse * 0.95 * diffuseIntensity * lightInt +
ambient * 0.30 +
diffuse * 0.70 * diffuseIntensity * lightInt +
clamp(specular * specularIntensity, 0.0, 1.0) * 1.0;
gl_FragColor = clamp(finalColor, 0.0, 1.0);
gl_FragColor.a = 0.4;
gl_FragColor.a = alpha;
// FOG
//float mixing = pow((1.0 - v_CamPos.z * 3.0), 2);

73
res/icons/dots.svg Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 525.153 525.153" style="enable-background:new 0 0 525.153 525.153;" xml:space="preserve">
<g>
<path d="M96.781,290.234c-15.229,0-27.658,12.407-27.658,27.658c0,15.12,12.407,27.658,27.658,27.658
c15.12,0,27.658-12.516,27.658-27.658C124.439,302.641,111.901,290.234,96.781,290.234z M96.781,400.713
c-15.229,0-27.658,12.516-27.658,27.658c0,15.229,12.407,27.658,27.658,27.658c15.12,0,27.658-12.407,27.658-27.658
C124.439,413.251,111.901,400.713,96.781,400.713z M96.781,179.624c-15.229,0-27.658,12.516-27.658,27.658
c0,15.229,12.407,27.658,27.658,27.658c15.12,0,27.658-12.407,27.658-27.658C124.439,192.14,111.901,179.624,96.781,179.624z
M13.829,193.453C6.105,193.453,0,199.558,0,207.282c0,7.724,6.105,13.829,13.829,13.829s13.829-6.105,13.829-13.829
C27.658,199.558,21.531,193.453,13.829,193.453z M96.781,69.123c-15.229,0-27.658,12.407-27.658,27.658
c0,15.12,12.407,27.658,27.658,27.658c15.12,0,27.658-12.516,27.658-27.658C124.439,81.552,111.901,69.123,96.781,69.123z
M511.324,221.089c7.724,0,13.829-6.105,13.829-13.829c0-7.724-6.105-13.829-13.829-13.829c-7.724,0-13.829,6.105-13.829,13.829
C497.495,214.984,503.621,221.089,511.324,221.089z M317.87,124.439c15.12,0,27.658-12.516,27.658-27.658
c0-15.229-12.516-27.658-27.658-27.658c-15.229,0-27.658,12.407-27.658,27.658C290.234,111.901,302.641,124.439,317.87,124.439z
M317.87,27.658c7.724,0,13.829-6.105,13.829-13.829S325.595,0,317.87,0c-7.724,0-13.829,6.105-13.829,13.829
S310.168,27.658,317.87,27.658z M13.829,304.063C6.105,304.063,0,310.168,0,317.87s6.105,13.829,13.829,13.829
s13.829-6.105,13.829-13.829C27.658,310.146,21.531,304.063,13.829,304.063z M207.282,497.495c-7.724,0-13.829,6.105-13.829,13.829
c0,7.724,6.105,13.829,13.829,13.829c7.724,0,13.829-6.105,13.829-13.829C221.111,503.599,214.984,497.495,207.282,497.495z
M207.282,27.658c7.724,0,13.829-6.105,13.829-13.829S214.984,0,207.282,0s-13.829,6.105-13.829,13.829
S199.558,27.658,207.282,27.658z M207.282,124.439c15.229,0,27.658-12.516,27.658-27.658c0-15.229-12.407-27.658-27.658-27.658
c-15.12,0-27.658,12.407-27.658,27.658C179.624,111.901,192.14,124.439,207.282,124.439z M207.282,276.405
c-22.975,0-41.487,18.512-41.487,41.487s18.512,41.487,41.487,41.487s41.487-18.512,41.487-41.487S230.236,276.405,207.282,276.405
z M428.371,290.234c-15.12,0-27.658,12.407-27.658,27.658c0,15.12,12.516,27.658,27.658,27.658
c15.229,0,27.658-12.516,27.658-27.658C456.029,302.641,443.601,290.234,428.371,290.234z M428.371,400.713
c-15.12,0-27.658,12.516-27.658,27.658c0,15.229,12.516,27.658,27.658,27.658c15.229,0,27.658-12.407,27.658-27.658
C456.029,413.251,443.601,400.713,428.371,400.713z M428.371,179.624c-15.12,0-27.658,12.516-27.658,27.658
c0,15.229,12.516,27.658,27.658,27.658c15.229,0,27.658-12.407,27.658-27.658C456.029,192.14,443.601,179.624,428.371,179.624z
M428.371,69.123c-15.12,0-27.658,12.407-27.658,27.658c0,15.12,12.516,27.658,27.658,27.658c15.229,0,27.658-12.516,27.658-27.658
C456.029,81.552,443.601,69.123,428.371,69.123z M511.324,304.063c-7.724,0-13.829,6.105-13.829,13.829s6.105,13.829,13.829,13.829
c7.724,0,13.829-6.127,13.829-13.851C525.153,310.146,519.048,304.063,511.324,304.063z M317.87,400.713
c-15.229,0-27.658,12.516-27.658,27.658c0,15.229,12.407,27.658,27.658,27.658c15.12,0,27.658-12.407,27.658-27.658
C345.529,413.251,333.012,400.713,317.87,400.713z M317.87,497.495c-7.724,0-13.829,6.105-13.829,13.829
c0,7.724,6.127,13.829,13.829,13.829s13.829-6.105,13.829-13.829C331.699,503.599,325.595,497.495,317.87,497.495z
M207.282,165.795c-22.975,0-41.487,18.512-41.487,41.487s18.512,41.487,41.487,41.487s41.487-18.512,41.487-41.487
S230.236,165.795,207.282,165.795z M207.282,400.713c-15.12,0-27.658,12.516-27.658,27.658c0,15.229,12.516,27.658,27.658,27.658
c15.229,0,27.658-12.407,27.658-27.658C234.918,413.251,222.511,400.713,207.282,400.713z M317.87,276.405
c-22.975,0-41.487,18.512-41.487,41.487s18.512,41.487,41.487,41.487s41.487-18.512,41.487-41.487S340.846,276.405,317.87,276.405z
M317.87,165.795c-22.975,0-41.487,18.512-41.487,41.487s18.512,41.487,41.487,41.487s41.487-18.512,41.487-41.487
S340.846,165.795,317.87,165.795z"/>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

54
res/icons/wall.svg Normal file
View File

@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="439.875px" height="439.875px" viewBox="0 0 439.875 439.875" style="enable-background:new 0 0 439.875 439.875;"
xml:space="preserve">
<g>
<g id="iconos_32_">
<rect y="329.906" width="133.875" height="47.812"/>
<rect x="153" y="329.906" width="133.875" height="47.812"/>
<rect x="76.5" y="262.969" width="133.875" height="47.812"/>
<rect y="196.031" width="133.875" height="47.812"/>
<rect x="153" y="196.031" width="133.875" height="47.812"/>
<rect x="76.5" y="129.094" width="133.875" height="47.812"/>
<rect x="229.5" y="262.969" width="133.875" height="47.812"/>
<rect x="229.5" y="129.094" width="133.875" height="47.812"/>
<rect y="62.156" width="133.875" height="47.812"/>
<rect x="153" y="62.156" width="133.875" height="47.812"/>
<rect x="306" y="329.906" width="133.875" height="47.812"/>
<rect x="306" y="196.031" width="133.875" height="47.812"/>
<rect x="306" y="62.156" width="133.875" height="47.812"/>
</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB