From a12bdf5d407d912cbf406126f595acba4c71975d Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 27 Feb 2020 21:03:38 +0100
Subject: [PATCH] 3D models for Frogs and Pikes

---
 3d-models.cpp | 13 +++++++++++++
 graph.cpp     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/3d-models.cpp b/3d-models.cpp
index 30c60e17..20013d0c 100644
--- a/3d-models.cpp
+++ b/3d-models.cpp
@@ -969,6 +969,9 @@ void geometry_information::make_3d_models() {
   shift_shape(shBullHorn, -g-(AHEAD - ABODY));
   // make_revolution_cut(shBullHorn, 180, AHEAD - ABODY);
   
+  make_paw_3d(shFrogFrontFoot, shFrogFrontLeg);
+  make_paw_3d(shFrogRearFoot, shFrogRearLeg);
+  
   make_paw_3d(shTrylobiteFrontClaw, shTrylobiteFrontLeg);
   make_paw_3d(shTrylobiteRearClaw, shTrylobiteRearLeg);
   make_abody_3d(shTrylobiteBody, 0);
@@ -976,6 +979,7 @@ void geometry_information::make_3d_models() {
   make_revolution_cut(shTrylobiteHead, 180, AHEAD - ABODY +g);
   
   make_revolution_cut(shShark, 180, WDIM == 2 ? -FLOOR : 0);
+  make_revolution_cut(shPikeBody, 180, WDIM == 2 ? -FLOOR : 0);
 
   make_revolution_cut(shGhost, 60, GHOST + g);
 
@@ -1007,6 +1011,8 @@ void geometry_information::make_3d_models() {
   make_revolution(shBugArmor, 180, ABODY);
   make_revolution_cut(shBugAntenna, 90, ABODY);
   
+  make_revolution(shFrogBody, 180, ABODY);
+  
   make_revolution_cut(shButterflyBody, 180, 0);
   make_revolution_cut(shButterflyWing, 180, 0, 0.05*S);
   finishshape();
@@ -1036,6 +1042,10 @@ void geometry_information::make_3d_models() {
   disable(shPFace);
   disable(shJiangShi);
   
+  disable(shFrogFrontLeg);
+  disable(shFrogRearLeg);
+  disable(shFrogRearLeg2);
+  
   make_revolution_cut(shDragonSegment, 60, g);
   make_revolution_cut(shDragonHead, 60, g);
   make_revolution_cut(shDragonTail, 60, g);
@@ -1157,6 +1167,9 @@ void geometry_information::make_3d_models() {
   adjust_eye(shRatEye3, shRatHead, AHEAD, AHEAD, 1);
   
   adjust_eye(shWolfEyes, shWolfHead, AHEAD, AHEAD, 1);
+  
+  adjust_eye(shPikeEye, shPikeBody, 0, 0, 1);
+  adjust_eye(shFrogEye, shFrogBody, ABODY, AHEAD, 1);
 
   adjust_eye(shReptileEye, shReptileHead, AHEAD, AHEAD, 1);
   adjust_eye(shGadflyEye, shGadflyBody, 0, 0, 1);
diff --git a/graph.cpp b/graph.cpp
index 72000117..d2d88c6d 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -1430,7 +1430,7 @@ EX bool drawMonsterType(eMonster m, cell *where, const transmatrix& V1, color_t
     
     case moFrog: case moPhaser: case moVaulter: {
       ShadowV(V, cgi.shFrogBody);
-      const transmatrix VL = mmscale(V, cgi.ALEG0);
+      const transmatrix VL = GDIM == 3 ? V : mmscale(V, cgi.ALEG0);
       color_t xcolor = darkena(0xFF0000, 1, 0xFF);
       int alpha = (m == moPhaser ? 0xC0 : 0xFF);
       if(footphase) {