easier to re-apply the replacement table then merge from 2.4x, same as 23023
replacements... MTC_cross3Float -> Crossf MTC_diff3Float -> VecSubf MTC_dot3Float -> Inpf MTC_Mat3CpyMat4 -> Mat3CpyMat4 MTC_Mat3MulVecd -> Mat3MulVecd MTC_Mat3MulVecfl -> Mat3MulVecfl MTC_Mat4CpyMat4 -> Mat4CpyMat4 MTC_Mat4Invert -> Mat4Invert MTC_Mat4Mul3Vecfl -> Mat4Mul3Vecfl MTC_Mat4MulMat4 -> Mat4MulMat4 MTC_Mat4MulSerie -> Mat4MulSerie MTC_Mat4MulVec4fl -> Mat4MulVec4fl MTC_Mat4MulVecfl -> Mat4MulVecfl MTC_Mat4One -> Mat4One MTC_Mat4Ortho -> Mat4Ortho MTC_Mat4SwapMat4 -> Mat4SwapMat4
This commit is contained in:
@@ -32,8 +32,8 @@
|
||||
/* External modules: */
|
||||
#include "IMB_imbuf_types.h"
|
||||
#include "IMB_imbuf.h"
|
||||
#include "MTC_matrixops.h"
|
||||
#include "MTC_vectorops.h"
|
||||
|
||||
|
||||
|
||||
#include "DNA_camera_types.h"
|
||||
#include "DNA_group_types.h"
|
||||
@@ -155,7 +155,7 @@ static void render_lighting_halo(HaloRen *har, float *colf)
|
||||
|
||||
/* rotate view to lampspace */
|
||||
VECCOPY(lvrot, lv);
|
||||
MTC_Mat3MulVecfl(lar->imat, lvrot);
|
||||
Mat3MulVecfl(lar->imat, lvrot);
|
||||
|
||||
x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2]));
|
||||
/* 1.0/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */
|
||||
@@ -553,7 +553,7 @@ void shadeSkyView(float *colf, float *rco, float *view, float *dxyview, short th
|
||||
VECCOPY(lo, view);
|
||||
if(R.wrld.skytype & WO_SKYREAL) {
|
||||
|
||||
MTC_Mat3MulVecfl(R.imat, lo);
|
||||
Mat3MulVecfl(R.imat, lo);
|
||||
|
||||
SWAP(float, lo[1], lo[2]);
|
||||
|
||||
@@ -595,7 +595,7 @@ void shadeSunView(float *colf, float *view)
|
||||
|
||||
VECCOPY(sview, view);
|
||||
Normalize(sview);
|
||||
MTC_Mat3MulVecfl(R.imat, sview);
|
||||
Mat3MulVecfl(R.imat, sview);
|
||||
if (sview[2] < 0.0)
|
||||
sview[2] = 0.0;
|
||||
Normalize(sview);
|
||||
@@ -678,7 +678,7 @@ void shadeAtmPixel(struct SunSky *sunsky, float *collector, float fx, float fy,
|
||||
|
||||
calc_view_vector(view, fx, fy);
|
||||
Normalize(view);
|
||||
/*MTC_Mat3MulVecfl(R.imat, view);*/
|
||||
/*Mat3MulVecfl(R.imat, view);*/
|
||||
AtmospherePixleShader(sunsky, view, distance, collector);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user