Compare commits
1 Commits
sv-1.8.7.8
...
1-8-6Supp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43aa145c94 |
@@ -74,8 +74,7 @@ void main()
|
|||||||
|
|
||||||
//transform vertex
|
//transform vertex
|
||||||
#ifdef HAS_SKIN
|
#ifdef HAS_SKIN
|
||||||
mat4 trans = getObjectSkinnedTransform();
|
mat4 trans = modelview_matrix * getObjectSkinnedTransform();
|
||||||
trans = modelview_matrix * trans;
|
|
||||||
|
|
||||||
pos = trans * vec4(position.xyz, 1.0);
|
pos = trans * vec4(position.xyz, 1.0);
|
||||||
|
|
||||||
|
|||||||
@@ -34,9 +34,8 @@ mat4 getObjectSkinnedTransform();
|
|||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
//transform vertex
|
//transform vertex
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -44,9 +44,7 @@ void main()
|
|||||||
{
|
{
|
||||||
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
||||||
|
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
|
|||||||
@@ -41,9 +41,8 @@ void main()
|
|||||||
{
|
{
|
||||||
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
||||||
|
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
vec4 norm = vec4(position.xyz, 1.0);
|
vec4 norm = vec4(position.xyz, 1.0);
|
||||||
|
|||||||
@@ -83,9 +83,7 @@ VARYING vec2 vary_texcoord0;
|
|||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
#if HAS_SKIN
|
#if HAS_SKIN
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
|
|
||||||
vec3 pos = (mat*vec4(position.xyz,1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz,1.0)).xyz;
|
||||||
|
|
||||||
|
|||||||
@@ -43,9 +43,8 @@ void main()
|
|||||||
//transform vertex
|
//transform vertex
|
||||||
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
||||||
|
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
vertex_color = emissive;
|
vertex_color = emissive;
|
||||||
|
|||||||
@@ -42,9 +42,8 @@ mat4 getObjectSkinnedTransform();
|
|||||||
|
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
vec4 norm = vec4(position.xyz, 1.0);
|
vec4 norm = vec4(position.xyz, 1.0);
|
||||||
|
|||||||
@@ -42,9 +42,8 @@ void main()
|
|||||||
//transform vertex
|
//transform vertex
|
||||||
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
||||||
|
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
calcAtmospherics(pos.xyz);
|
calcAtmospherics(pos.xyz);
|
||||||
|
|||||||
@@ -42,9 +42,8 @@ mat4 getObjectSkinnedTransform();
|
|||||||
|
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
vec4 norm = vec4(position.xyz, 1.0);
|
vec4 norm = vec4(position.xyz, 1.0);
|
||||||
|
|||||||
@@ -44,9 +44,8 @@ void main()
|
|||||||
//transform vertex
|
//transform vertex
|
||||||
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
|
||||||
|
|
||||||
mat4 mat = getObjectSkinnedTransform();
|
mat4 mat = modelview_matrix * getObjectSkinnedTransform();
|
||||||
|
|
||||||
mat = modelview_matrix * mat;
|
|
||||||
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz;
|
||||||
|
|
||||||
vec4 norm = vec4(position.xyz, 1.0);
|
vec4 norm = vec4(position.xyz, 1.0);
|
||||||
|
|||||||
Reference in New Issue
Block a user