# Additions

- libpicasso (shader compiling)
- linearAllocator template (for std::vector)
- palladium vec and mat api
- iron (2d renderer)

example/source/main.cpp

@@ -1,5 +1,46 @@
+#include "amethyst/iron.hpp"
 #include <amethyst.hpp>
 
+const char* shader_ = R"(; Example PICA200 vertex shader
+
+; Uniforms
+.fvec projection[4]
+
+; Constants
+.constf myconst(0.0, 1.0, -1.0, 0.1)
+.constf myconst2(0.3, 0.0, 0.0, 0.0)
+.alias  zeros myconst.xxxx ; Vector full of zeros
+.alias  ones  myconst.yyyy ; Vector full of ones
+
+; Outputs
+.out outpos position
+.out outclr color
+
+; Inputs (defined as aliases for convenience)
+.alias inpos v0
+.alias inclr v1
+
+.bool test
+
+.proc main
+	; Force the w component of inpos to be 1.0
+	mov r0.xyz, inpos
+	mov r0.w,   ones
+
+	; outpos = projectionMatrix * inpos
+	dp4 outpos.x, projection[0], r0
+	dp4 outpos.y, projection[1], r0
+	dp4 outpos.z, projection[2], r0
+	dp4 outpos.w, projection[3], r0
+
+	; outclr = inclr
+	mov outclr, inclr
+
+	; We're finished
+	end
+.end
+)";
+
 static C3D_Mtx projection;
 
 int main() {
@@ -7,28 +48,11 @@ int main() {
   amy::ctru::init();
   amy::c3d::init();
   auto top = amy::c3d::createScreen(GFX_TOP, GFX_LEFT);
-  auto shader = new amy::c3d::shader("romfs:/shaders/shader2d.shbin");
-  shader->input(GPU_FLOAT, 3);
-  shader->input(GPU_FLOAT, 3);
-  amy::c3d::frag::edit();
-  amy::c3d::frag::src(C3D_Both);
-  amy::c3d::frag::func(C3D_Both, GPU_REPLACE);
-  Mtx_Identity(&projection);
-  Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true);
+  amy::iron::init();
   while (aptMainLoop()) {
     amy::c3d::startFrame();
     top->startDraw();
     top->clear();
-    shader->use();
-    shader->setMat4(0, &projection);
-    C3D_ImmDrawBegin(GPU_TRIANGLES);
-    C3D_ImmSendAttrib(200, 200, 0.5, 0);
-    C3D_ImmSendAttrib(1, 0, 0, 1);
-    C3D_ImmSendAttrib(100, 40, 0.5, 0);
-    C3D_ImmSendAttrib(0, 1, 0, 1);
-    C3D_ImmSendAttrib(300, 40, 0.5, 0);
-    C3D_ImmSendAttrib(0, 0, 1, 1);
-    C3D_ImmDrawEnd();
     amy::c3d::endFrame();
   }
   amy::c3d::deleteScreen(top);