mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-07 04:45:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into gl-modernize

Browse Source
This commit is contained in:
Mischa Spiegelmock
2018-06-03 15:11:24 +02:00
parent 863fe4c364 b91078e311
commit 4eb2852af8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libprojectM/MilkdropPresetFactory/Expr.cpp
View File

@ -140,7 +140,7 @@ public:
};
/* TODO optimize FloatParameterExpr::eval() further.
// - flag "never matrix" parameters
// - always pass in 2d matrix. instead of using (i, -1) for 1d matrix, we could just use (0, i) and avoid check
// - always pass in 2d matrix. instead of using (i, -1) for 1d matrix, we could just use (0, i) and avoid check
// - instead of using matrix_flag to give "copy on write" behavior, maybe pre-copy from engine_val to matrix[]
*/
float FloatParameterExpr::eval ( int mesh_i, int mesh_j )
@ -160,7 +160,9 @@ float FloatParameterExpr::eval ( int mesh_i, int mesh_j )
}
else
{
return ( ( ( float* ) term.param->matrix ) [mesh_i] );
// issue 64, make sure we're not reading a P_FLAG_PER_PIXEL matrix variable
if (!(term.param->flags & P_FLAG_PER_PIXEL))
return ( ( ( float* ) term.param->matrix ) [mesh_i] );
}
}
//assert(mesh_i >=0);

2
src/libprojectM/MilkdropPresetFactory/Param.cpp
View File

@ -47,6 +47,7 @@ Param::Param( std::string _name, short int _type, short int _flags, void * _engi
flags (_flags),
matrix_flag (0),
engine_val(_engine_val),
local_value(0.0),
matrix (_matrix),
default_init_val (_default_init_val),
upper_bound (_upper_bound),
@ -62,6 +63,7 @@ Param::Param(std::string _name) :
type(P_TYPE_DOUBLE),
flags(P_FLAG_USERDEF),
matrix_flag(0),
local_value(0.0),
matrix(0)
{