graphics

commit 2fb20dfd8df80dfa9df514366c1259f5443d6398
parent 61a3785ad295163f8de095887c3788fb3ec4ce40
Author: Brian Swetland <swetland@frotz.net>
Date:   Tue,  2 Jul 2013 10:14:34 -0700

test: rename "test" to "object", and simplify

Some day we'll have more tests...

Diffstat:
M
test/module.mk
 | 
4
++--
A
test/object.cc
 | 
112
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D
test/test.cc
 | 
140
-------------------------------------------------------------------------------

3 files changed, 114 insertions(+), 142 deletions(-)
diff --git a/test/module.mk b/test/module.mk
@@ -1,7 +1,7 @@
 M_PATH := $(modulepath)
 
-M_NAME := test
-M_OBJS := test.o
+M_NAME := object
+M_OBJS := object.o
 M_LIBS := common
 
 include build/app.mk
diff --git a/test/object.cc b/test/object.cc
@@ -0,0 +1,112 @@
+/* Copyright 2013 Brian Swetland <swetland@frotz.net>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "app.h"
+#include "matrix.h"
+#include "util.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+// idx, src, dst, count, offset, stride, divisor
+static VertexAttrDesc layout[] = {
+	{ 0, SRC_FLOAT, DST_FLOAT, 3,  0, 32, 0 },
+	{ 1, SRC_FLOAT, DST_FLOAT, 3, 12, 32, 0 },
+	{ 2, SRC_FLOAT, DST_FLOAT, 2, 24, 32, 0 },
+};
+
+class TestApp : public App {
+public:
+	TestApp();
+	int init(void);
+	void render(void);
+	void release(void);
+	void build(void);
+
+private:
+	float r;
+
+	PixelShader ps;
+	VertexShader vs;
+	Program pgm;
+	IndexBuffer ibuf;
+	VertexBuffer vbuf;
+	UniformBuffer ubuf;
+	VertexAttributes attr;
+
+	mat4 proj;
+	struct model *m;
+};
+
+TestApp::TestApp() : App(), r(0.0) {
+}
+
+void TestApp::release(void) {
+}
+
+int TestApp::init(void) {
+	VertexBuffer *data[] = {
+		&vbuf, &vbuf, &vbuf,
+	};
+
+	if (!(m = load_wavefront_obj("unitcubeoid.obj")))
+		return error("cannot load model");
+	printx("Object Loaded. %d vertices, %d indices.\n", m->vcount, m->icount);
+
+	proj.setPerspective(D2R(90.0), width / (float) height, 0.1f, 250.0f);
+
+	ps.load("simple.fragment");
+	vs.load("simple.vertex");
+	pgm.link(&vs, &ps);
+
+	vbuf.load(m->vdata, 32 * m->vcount);
+	ibuf.load(m->idx, 2 * m->icount);
+	ubuf.load(NULL, 32 * 4);
+
+	attr.init(layout, data, sizeof(layout)/sizeof(layout[0]));
+
+	/* this will persist because it is part of the VAO state */
+	ibuf.use();
+
+	return 0;
+}
+
+void TestApp::render(void) {
+	struct {
+		mat4 mvp;
+		mat4 mv;
+	} cb0;
+	mat4 world, view, tmp;
+
+	r += 0.010;
+	if (r > 360.0) r = 0.0;
+
+	view.identity().rotateX(D2R(10)).rotateY(r).translate(0,0,-2);
+	world.identity();
+
+	cb0.mvp = world * view * proj;
+	cb0.mv = world * view;
+
+	ubuf.load(&cb0, 32 * 4);
+
+	pgm.use();
+	ubuf.use(0);
+	attr.use();
+	glDrawElements(GL_TRIANGLES, m->icount, GL_UNSIGNED_SHORT, NULL);
+}
+
+App *createApp(void) {
+	return new TestApp();
+}
diff --git a/test/test.cc b/test/test.cc
@@ -1,140 +0,0 @@
-/* Copyright 2013 Brian Swetland <swetland@frotz.net>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "app.h"
-#include "matrix.h"
-#include "util.h"
-#include "textgrid.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-// idx, src, dst, count, offset, stride, divisor
-static VertexAttrDesc layout[] = {
-	{ 0, SRC_FLOAT, DST_FLOAT, 3,  0, 32, 0 },
-	{ 1, SRC_FLOAT, DST_FLOAT, 3, 12, 32, 0 },
-	{ 2, SRC_FLOAT, DST_FLOAT, 2, 24, 32, 0 },
-};
-
-class TestApp : public App {
-public:
-	TestApp();
-	int init(void);
-	void render(void);
-	void release(void);
-	void build(void);
-
-private:
-	float r;
-
-	PixelShader ps;
-	VertexShader vs;
-	Program pgm;
-	IndexBuffer ibuf;
-	VertexBuffer vbuf;
-	UniformBuffer ubuf;
-	VertexAttributes attr;
-
-	mat4 proj;
-	struct model *m;
-
-	int ps_mtime;
-	int vs_mtime;
-};
-
-static const char *psfn = "simple.fragment";
-static const char *vsfn = "simple.vertex";
-
-TestApp::TestApp() : App(), r(0.0) {
-}
-
-void TestApp::release(void) {
-}
-
-int TestApp::init(void) {
-	VertexBuffer *data[] = {
-		&vbuf, &vbuf, &vbuf,
-	};
-	ps_mtime = file_get_mtime(psfn);
-	vs_mtime = file_get_mtime(vsfn);
-
-	if (!(m = load_wavefront_obj("unitcubeoid.obj")))
-		return error("cannot load model");
-	printx("Object Loaded. %d vertices, %d indices.\n", m->vcount, m->icount);
-
-	proj.setPerspective(D2R(90.0), width / (float) height, 0.1f, 250.0f);
-
-	ps.load(psfn);
-	vs.load(vsfn);
-	pgm.link(&vs, &ps);
-
-	vbuf.load(m->vdata, 32 * m->vcount);
-	ibuf.load(m->idx, 2 * m->icount);
-	ubuf.load(NULL, 32 * 4);
-
-	attr.init(layout, data, sizeof(layout)/sizeof(layout[0]));
-
-	/* this will persist because it is part of the VAO state */
-	ibuf.use();
-
-	return 0;
-}
-
-void TestApp::render(void) {
-	unsigned stride, offset;
-	int t;
-
-#if 0
-	t = file_get_mtime(psfn);
-	if (t != ps_mtime) {
-		printx("ps change!\n");
-		ps.load(psfn);
-		ps_mtime = t;
-		pgm.link(&vs, &ps);
-	}
-	t = file_get_mtime(vsfn);
-	if (t != vs_mtime) {
-		printx("vs change!\n");
-		vs.load(vsfn);
-		vs_mtime = t;
-		pgm.link(&vs, &ps);
-	}
-#endif
-	struct {
-		mat4 mvp;
-		mat4 mv;
-	} cb0;
-	mat4 world, view, tmp;
-
-	r += 0.010;
-	if (r > 360.0) r = 0.0;
-
-	view.identity().rotateX(D2R(10)).rotateY(r).translate(0,0,-2);
-	world.identity();
-
-	cb0.mvp = world * view * proj;
-	cb0.mv = world * view;
-
-	ubuf.load(&cb0, 32 * 4);
-
-	pgm.use();
-	ubuf.use(0);
-	attr.use();
-	glDrawElements(GL_TRIANGLES, m->icount, GL_UNSIGNED_SHORT, NULL);
-}
-
-App *createApp(void) {
-	return new TestApp();
-}