mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-29 10:45:53 +00:00
Code Issues Projects Releases Wiki Activity

PJS: maybe I made some mistakes... either way, progress is made

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@206 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-06-22 02:31:41 +00:00
parent 0d34e05c6c
commit f4025c8eaf
12 changed files with 774 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/projectM-engine/Expr.cpp
View File

@ -123,11 +123,11 @@ float ValExpr::eval_val_expr() {
/** Sanity check the matrix is there... */
assert(term.param->matrix != NULL );
if (projectM::currentEngine->mesh_i >= 0) {
if (projectM::currentEngine->mesh_j >= 0) {
return (((float**)term.param->matrix)[projectM::currentEngine->mesh_i][projectM::currentEngine->mesh_j]);
if (projectM::currentEngine->renderer->mesh_i >= 0) {
if (projectM::currentEngine->renderer->mesh_j >= 0) {
return (((float**)term.param->matrix)[projectM::currentEngine->renderer->mesh_i][projectM::currentEngine->renderer->mesh_j]);
} else {
return (((float*)term.param->matrix)[projectM::currentEngine->mesh_i]);
return (((float*)term.param->matrix)[projectM::currentEngine->renderer->mesh_i]);
}
}
}