Worked out multiple renderers

nicholas477 · Dec 14, 2023 · bcf4b2c · bcf4b2c
1 parent f91ee3a
commit bcf4b2c
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 25 deletions.
diff --git a/assets/models/plane.fbx b/assets/models/plane.fbx
diff --git a/src/Makefile.vuprogs b/src/Makefile.vuprogs
@@ -1,5 +1,6 @@
 RENDERERS = \
-	vertex_color_renderer
+	vertex_color_renderer \
+	vertex_color_vegetation_renderer
 
 EE_OBJS += $(addsuffix .vo, $(addprefix vu1/, $(RENDERERS)))
 VSM_SOURCES = $(addsuffix _vcl.vsm, $(addprefix vu1/, $(RENDERERS)))

diff --git a/src/renderer/ps2gl_renderers/vertex_color_renderer.cc b/src/renderer/ps2gl_renderers/vertex_color_renderer.cc
@@ -77,12 +77,6 @@ void CVertexColorRenderer::InitContext(GLenum primType, tU32 rcChanges, bool use
 		GS::tPrim prim = {prim_type : primType, iip : smoothShading, tme : useTexture, fge : 0, abe : alpha, aa1 : 0, fst : 0, ctxt : 0, fix : 0};
 		tGifTag giftag = {NLOOP : 0, EOP : 1, pad0 : 0, id : 0, PRE : 1, PRIM : *(tU64*)&prim, FLG : 0, NREG : nreg, REGS0 : 2, REGS1 : 1, REGS2 : 4};
 
-		packet.Pad96();
-
-		packet.OpenUnpack(Vifs::UnpackModes::s_32, kIsVegetation, Packet::kSingleBuff);
-		packet += (s32)0;
-		packet.CloseUnpack(1);
-
 		packet.Mscal(0);
 		packet.Flushe();
 

diff --git a/src/renderer/ps2gl_renderers/vertex_color_vegetation_renderer.cc b/src/renderer/ps2gl_renderers/vertex_color_vegetation_renderer.cc
@@ -16,11 +16,11 @@
 #include "engine.hpp"
 
 extern "C" {
-VU_FUNCTIONS(VertexColorRenderer);
+VU_FUNCTIONS(VertexColorVegetationRenderer);
 }
 
 CVertexColorVegetationRenderer::CVertexColorVegetationRenderer()
-    : CCustomRendererBase(mVsmAddr(VertexColorRenderer), mVsmSize(VertexColorRenderer), 4, 3,
+    : CCustomRendererBase(mVsmAddr(VertexColorVegetationRenderer), mVsmSize(VertexColorVegetationRenderer), 4, 3,
                           kInputStart,
                           kInputBufSize - kInputStart,
                           "Vertex color vegetation renderer")
@@ -67,8 +67,6 @@ void CVertexColorVegetationRenderer::InitContext(GLenum primType, tU32 rcChanges
 	CVifSCDmaPacket& packet      = glContext.GetVif1Packet();
 	CImmDrawContext& drawContext = glContext.GetImmDrawContext();
 
-	drawContext.DrawEnv->SetFogColor(128, 128, 128);
-
 	packet.Cnt();
 	{
 		AddVu1RendererContext(packet, primType, kContextStart);
@@ -81,15 +79,11 @@ void CVertexColorVegetationRenderer::InitContext(GLenum primType, tU32 rcChanges
 		bool alpha         = drawContext.GetBlendEnabled();
 		unsigned int nreg  = OutputQuadsPerVert;
 
-		GS::tPrim prim = {prim_type : primType, iip : smoothShading, tme : useTexture, fge : 1, abe : alpha, aa1 : 0, fst : 0, ctxt : 0, fix : 0};
+		GS::tPrim prim = {prim_type : primType, iip : smoothShading, tme : useTexture, fge : 0, abe : alpha, aa1 : 0, fst : 0, ctxt : 0, fix : 0};
 		tGifTag giftag = {NLOOP : 0, EOP : 1, pad0 : 0, id : 0, PRE : 1, PRIM : *(tU64*)&prim, FLG : 0, NREG : nreg, REGS0 : 2, REGS1 : 1, REGS2 : 4};
 
 		packet.Pad96();
 
-		packet.OpenUnpack(Vifs::UnpackModes::s_32, kIsVegetation, Packet::kSingleBuff);
-		packet += (s32)1;
-		packet.CloseUnpack(1);
-
 		packet.OpenUnpack(Vifs::UnpackModes::s_32, kVegetationParams, Packet::kSingleBuff);
 		packet += get_veg_p(0.f);
 		packet += get_veg_p(M_PI / 6.f);

diff --git a/vu1/vertex_color_renderer.vo b/vu1/vertex_color_renderer.vo
diff --git a/vu1/vertex_color_renderer_context.h b/vu1/vertex_color_renderer_context.h
@@ -65,8 +65,6 @@ typedef struct
 
 #define kClipInfo (kGifTag + 1)
 
-#define kIsVegetation (kClipInfo + 1)
-
-#define kVegetationParams (kIsVegetation + 1)
+#define kVegetationParams (kClipInfo + 1)
 
 #define kContextLength (kVegetationParams - kContextStart + 6)
diff --git a/vu1/vertex_color_vegetation_renderer.vcl b/vu1/vertex_color_vegetation_renderer.vcl
@@ -22,7 +22,7 @@ kOutputQPerV        .equ           3
      .init_vf_all
      .init_vi_all
 
-     .name          vsmVertexColorRenderer
+     .name          vsmVertexColorVegetationRenderer
 
      --enter
      --endenter
@@ -65,11 +65,6 @@ xform_loop_lid:          --LoopCS 1,3
      store_rgba   vert_color 
 
 ; Wind
-     ; Skip the vegetation stuff if this isn't rendering vegetation
-     ;ilw.x               is_vegetation, kIsVegetation(vi00)
-     ;ibeq                is_vegetation, vi00, project_lid
-
-	; Wind
      ; Lookup the leaf index from the vertex color
      ilw.x               leaf_index, 3(next_input)
 

diff --git a/vu1/vertex_color_vegetation_renderer.vo b/vu1/vertex_color_vegetation_renderer.vo