Switch fountain to use ProgramVertex rather than hard coded camers in scripts. Remove camera code from scripts.
diff --git a/rsProgramVertex.cpp b/rsProgramVertex.cpp
index fc26ab5..c24f228 100644
--- a/rsProgramVertex.cpp
+++ b/rsProgramVertex.cpp
@@ -25,14 +25,21 @@
Program(in, out)
{
mTextureMatrixEnable = false;
- mProjectionEnable = false;
- mTransformEnable = false;
}
ProgramVertex::~ProgramVertex()
{
}
+static void logMatrix(const char *txt, const float *f)
+{
+ LOGE("Matrix %s, %p", txt, f);
+ LOGE("%6.2f, %6.2f, %6.2f, %6.2f", f[0], f[4], f[8], f[12]);
+ LOGE("%6.2f, %6.2f, %6.2f, %6.2f", f[1], f[5], f[9], f[13]);
+ LOGE("%6.2f, %6.2f, %6.2f, %6.2f", f[2], f[6], f[10], f[14]);
+ LOGE("%6.2f, %6.2f, %6.2f, %6.2f", f[3], f[7], f[11], f[15]);
+}
+
void ProgramVertex::setupGL()
{
const float *f = static_cast<const float *>(mConstants[0]->getPtr());
@@ -44,19 +51,13 @@
glLoadIdentity();
}
+ //logMatrix("prog", &f[RS_PROGRAM_VERTEX_PROJECTION_OFFSET]);
+ //logMatrix("model", &f[RS_PROGRAM_VERTEX_MODELVIEW_OFFSET]);
glMatrixMode(GL_PROJECTION);
- if (mProjectionEnable) {
- glLoadMatrixf(&f[RS_PROGRAM_VERTEX_PROJECTION_OFFSET]);
- } else {
- }
-
+ glLoadMatrixf(&f[RS_PROGRAM_VERTEX_PROJECTION_OFFSET]);
glMatrixMode(GL_MODELVIEW);
- if (mTransformEnable) {
- glLoadMatrixf(&f[RS_PROGRAM_VERTEX_MODELVIEW_OFFSET]);
- } else {
- glLoadIdentity();
- }
+ glLoadMatrixf(&f[RS_PROGRAM_VERTEX_MODELVIEW_OFFSET]);
}
void ProgramVertex::setConstantType(uint32_t slot, const Type *t)
@@ -110,26 +111,11 @@
rsc->mStateVertex.mPV->setConstantType(slot, static_cast<const Type *>(constants));
}
-void rsi_ProgramVertexSetCameraMode(Context *rsc, bool ortho)
-{
- rsc->mStateVertex.mPV->setProjectionEnabled(!ortho);
-}
-
void rsi_ProgramVertexSetTextureMatrixEnable(Context *rsc, bool enable)
{
rsc->mStateVertex.mPV->setTextureMatrixEnable(enable);
}
-void rsi_ProgramVertexSetModelMatrixEnable(Context *rsc, bool enable)
-{
- rsc->mStateVertex.mPV->setTransformEnable(enable);
-}
-
-void rsi_ProgramVertexSetProjectionMatrixEnable(Context *rsc, bool enable)
-{
- rsc->mStateVertex.mPV->setProjectionEnable(enable);
-}
-
}