Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split declareStandardTransform

Browse source
This commit is contained in:
Atlante45 2016-01-19 14:43:13 -08:00
parent 71ecd1662c
commit 38a223b270
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/gpu/src/gpu/Transform.slh
View file

@ -10,13 +10,8 @@
<@if not GPU_TRANSFORM_STATE_SLH@> <@if not GPU_TRANSFORM_STATE_SLH@>
<@def GPU_TRANSFORM_STATE_SLH@> <@def GPU_TRANSFORM_STATE_SLH@>
<@func declareStandardTransform()@> <@func declareStandardCameraTransform()@>
struct TransformObject { struct TransformCamera {
mat4 _model;
mat4 _modelInverse;
};
struct TransformCamera {
mat4 _view; mat4 _view;
mat4 _viewInverse; mat4 _viewInverse;
mat4 _projectionViewUntranslated; mat4 _projectionViewUntranslated;
@ -25,6 +20,21 @@ struct TransformCamera {
vec4 _viewport; vec4 _viewport;
}; };
layout(std140) uniform transformCameraBuffer {
TransformCamera _camera;
};
TransformCamera getTransformCamera() {
return _camera;
}
<@endfunc@>
<@func declareStandardObjectTransform()@>
struct TransformObject {
mat4 _model;
mat4 _modelInverse;
};
in ivec2 _drawCallInfo; in ivec2 _drawCallInfo;
layout(std140) buffer transformObjectBuffer { layout(std140) buffer transformObjectBuffer {
@ -33,13 +43,12 @@ layout(std140) buffer transformObjectBuffer {
TransformObject getTransformObject() { TransformObject getTransformObject() {
return _object[_drawCallInfo.x]; return _object[_drawCallInfo.x];
} }
<@endfunc@>
layout(std140) uniform transformCameraBuffer {
TransformCamera _camera; <@func declareStandardTransform()@>
}; <$declareStandardObjectTransform()$>
TransformCamera getTransformCamera() { <$declareStandardCameraTransform()$>
return _camera;
}
<@endfunc@> <@endfunc@>
<@func transformCameraViewport(cameraTransform, viewport)@> <@func transformCameraViewport(cameraTransform, viewport)@>

2
libraries/render-utils/src/model_translucent.slf
View file

@ -17,7 +17,7 @@
<@include DeferredLighting.slh@> <@include DeferredLighting.slh@>
<@include gpu/Transform.slh@> <@include gpu/Transform.slh@>
<$declareStandardTransform()$> <$declareStandardCameraTransform()$>
// Everything about light // Everything about light