Changeset 12181

Timestamp:

Dec 11, 2018, 5:22:11 PM (6 years ago)

Author:

merholzl

Message:

all new materials for HS18

Location:

data/data_extern

Files:

• . (modified) (1 prop)
• images/levelpreviews/bumpMap.png (copied) (copied from data/branches/Shader_HS18/images/levelpreviews/bumpMap.png)
• images/textures/Cube_Lava_COLOR.jpg (copied) (copied from data/branches/Shader_HS18/images/textures/Cube_Lava_COLOR.jpg)
• images/textures/Cube_Lava_MASK.jpg (copied) (copied from data/branches/Shader_HS18/images/textures/Cube_Lava_MASK.jpg)
• images/textures/Cube_Lava_NORM.jpg (copied) (copied from data/branches/Shader_HS18/images/textures/Cube_Lava_NORM.jpg)
• materials/BumpMapping (copied) (copied from data/branches/Shader_HS18/materials/BumpMapping)
• materials/Cube_Lava.material (copied) (copied from data/branches/Shader_HS18/materials/Cube_Lava.material)
• materials/Cube_Lava_Normal.material (copied) (copied from data/branches/Shader_HS18/materials/Cube_Lava_Normal.material)
• materials/Cube_Lava_Normal_Blank.material (copied) (copied from data/branches/Shader_HS18/materials/Cube_Lava_Normal_Blank.material)
• materials/Example.material (deleted)
• materials/Examples.compositor (deleted)
• materials/Examples.program (deleted)
• materials/Flares.material (modified) (1 diff)
• materials/ToonShader.material (deleted)
• models/Cube_Lava.mesh (copied) (copied from data/branches/Shader_HS18/models/Cube_Lava.mesh)
• models/Cube_Lava_Normal.mesh (copied) (copied from data/branches/Shader_HS18/models/Cube_Lava_Normal.mesh)
• models/Cube_Lava_Normal_Blank.mesh (copied) (copied from data/branches/Shader_HS18/models/Cube_Lava_Normal_Blank.mesh)
• programs/AmbientOneTexture.glsl (deleted)
• programs/BloomFP.cg (deleted)
• programs/Blur0_ps20.hlsl (deleted)
• programs/Blur0_vs.glsl (deleted)
• programs/Blur0_vs11.hlsl (deleted)
• programs/Blur1_ps20.hlsl (deleted)
• programs/Blur1_vs.glsl (deleted)
• programs/Blur1_vs11.hlsl (deleted)
• programs/Blur_ps.glsl (deleted)
• programs/BumpMapping.cg (deleted)
• programs/Cg (copied) (copied from data/branches/Shader_HS18/programs/Cg)
• programs/Combine_fp.cg (deleted)
• programs/Example_Basic.cg (deleted)
• programs/Example_Basic.hlsl (deleted)
• programs/GLSL (copied) (copied from data/branches/Shader_HS18/programs/GLSL)
• programs/GLSL120 (copied) (copied from data/branches/Shader_HS18/programs/GLSL120)
• programs/GLSL150 (copied) (copied from data/branches/Shader_HS18/programs/GLSL150)
• programs/GLSL400 (copied) (copied from data/branches/Shader_HS18/programs/GLSL400)
• programs/GlassFP.cg (deleted)
• programs/Grass.cg (deleted)
• programs/GrayScale.cg (deleted)
• programs/InvertFP.cg (deleted)
• programs/LaplaceFP.cg (deleted)
• programs/OLD (copied) (copied from data/branches/Shader_HS18/programs/OLD)
• programs/OldMovieFP.cg (deleted)
• programs/OldTV.cg (deleted)
• programs/PosterizeFP.cg (deleted)
• programs/Radial_Blur_FP.cg (deleted)
• programs/SharpenEdgesFP.cg (deleted)
• programs/StdQuad_vp.cg (deleted)
• programs/StdQuad_vp.glsl (deleted)
• programs/TilingFP.cg (deleted)
• programs/ToonShaderPS.cg (deleted)
• programs/ToonShader_ps.frag (deleted)
• programs/ToonShader_vs.vert (deleted)
• programs/glow.cg (deleted)
• programs/hdr.cg (deleted)
• programs/hdr.hlsl (deleted)
• programs/hdr_bloom.glsl (deleted)
• programs/hdr_downscale2x2luminence.glsl (deleted)
• programs/hdr_downscale3x3.glsl (deleted)
• programs/hdr_downscale3x3brightpass.glsl (deleted)
• programs/hdr_finalToneMapping.glsl (deleted)
• programs/hdr_tonemap_util.glsl (deleted)
• programs/ps_glow.cg (deleted)
• programs/skinningTwoWeightsShadowCasterVp.glsl (deleted)
• programs/skinningTwoWeightsVp.glsl (deleted)
• programs/vs_glow.cg (deleted)
• resources.oxr (modified) (1 diff)

data/data_extern/materials/Flares.material

@@ +1 @@
+material Examples/Flare
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture flare.png
+                        }
+                }
+        }
+
+        technique
+        {
+                scheme glow
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture flare.png
+                        }
+                }
+        }
+}
 material Flares/point_lensflare
 {

data/data_extern/resources.oxr

@@ -13 +13 @@
     <ResourceLocation path = "images/textures/stellarobjects"/>
     <ResourceLocation path = "materials"        />
+    <ResourceLocation path = "materials/BumpMapping"        />
     <ResourceLocation path = "models"           />
     <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip"/>
     <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip"/>
+
     <ResourceLocation path = "programs"         />
+    <ResourceLocation path = "programs/GLSL"    />
+    <ResourceLocation path = "programs/Cg"    />
+    <ResourceLocation path = "programs/GLSL120/BumpMapping" />
+    <ResourceLocation path = "programs/GLSL120" />
+    <ResourceLocation path = "programs/GLSL150" />
+    <ResourceLocation path = "programs/GLSL400" />
+
 
     <ResourceLocation path = "gui/fonts"        />