peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 -8
4 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df27c23cd5 - Show all commits

2
Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/Outline.frag
View File

@@ -1,5 +1,3 @@
#version 150
// Samplers for textures // Samplers for textures
uniform sampler2D m_Texture; uniform sampler2D m_Texture;
uniform sampler2D m_OutlineDepthTexture; uniform sampler2D m_OutlineDepthTexture;

2
Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePre.frag
View File

@@ -1,5 +1,3 @@
#version 150
// Input texture coordinates from the vertex shader // Input texture coordinates from the vertex shader
in vec2 texCoord; in vec2 texCoord;

2
Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.frag
View File

@@ -1,5 +1,3 @@
#version 150
// Uniform samplers // Uniform samplers
uniform sampler2D m_Texture; uniform sampler2D m_Texture;
uniform sampler2D m_OutlineDepthTexture; uniform sampler2D m_OutlineDepthTexture;

2
Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/Post15.vert
View File

@@ -1,5 +1,3 @@
#version 150
// Vertex attributes // Vertex attributes
in vec4 inPosition; in vec4 inPosition;
in vec2 inTexCoord; in vec2 inTexCoord;