From 976d405d8f01ee7aec5bd9d6e0f0c3f578873587 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Tue, 4 Jun 2019 13:40:02 +0300
Subject: [PATCH] enum ModelType

---
 src/main/java/dmx/lwjake2/render/ModelType.java |  8 ++++++++
 src/main/java/lwjake2/render/lwjgl/Base.java    |  9 ---------
 src/main/java/lwjake2/render/lwjgl/Main.java    | 12 ++++++------
 src/main/java/lwjake2/render/lwjgl/Model.java   | 15 ++++++++-------
 src/main/java/lwjake2/render/model_t.java       |  7 +++----
 5 files changed, 25 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/dmx/lwjake2/render/ModelType.java

diff --git a/src/main/java/dmx/lwjake2/render/ModelType.java b/src/main/java/dmx/lwjake2/render/ModelType.java
new file mode 100644
index 0000000..4a2476e
--- /dev/null
+++ b/src/main/java/dmx/lwjake2/render/ModelType.java
@@ -0,0 +1,8 @@
+package dmx.lwjake2.render;
+
+public enum ModelType {
+    BAD,
+    BRUSH,
+    SPRITE,
+    ALIAS
+}
diff --git a/src/main/java/lwjake2/render/lwjgl/Base.java b/src/main/java/lwjake2/render/lwjgl/Base.java
index 1bf6826..3e59818 100644
--- a/src/main/java/lwjake2/render/lwjgl/Base.java
+++ b/src/main/java/lwjake2/render/lwjgl/Base.java
@@ -47,15 +47,6 @@ public abstract class Base extends LWJGLBase {
      * model skin sprite frame wall texture pic
      */
 
-    // enum modtype_t
-    static final int mod_bad = 0;
-    
-    static final int mod_brush = 1;
-    
-    static final int mod_sprite = 2;
-    
-    static final int mod_alias = 3;
-    
     static final int TEXNUM_LIGHTMAPS = 1024;
     
     static final int TEXNUM_SCRAPS = 1152;
diff --git a/src/main/java/lwjake2/render/lwjgl/Main.java b/src/main/java/lwjake2/render/lwjgl/Main.java
index c5d1985..344e8ac 100644
--- a/src/main/java/lwjake2/render/lwjgl/Main.java
+++ b/src/main/java/lwjake2/render/lwjgl/Main.java
@@ -408,13 +408,13 @@ public abstract class Main extends Base {
                     continue;
                 }
                 switch (currentmodel.type) {
-                    case mod_alias :
+                    case ALIAS:
                         R_DrawAliasModel(currententity);
                         break;
-                    case mod_brush :
+                    case BRUSH:
                         R_DrawBrushModel(currententity);
                         break;
-                    case mod_sprite :
+                    case SPRITE:
                         R_DrawSpriteModel(currententity);
                         break;
                     default :
@@ -442,13 +442,13 @@ public abstract class Main extends Base {
                     continue;
                 }
                 switch (currentmodel.type) {
-                    case mod_alias :
+                    case ALIAS:
                         R_DrawAliasModel(currententity);
                         break;
-                    case mod_brush :
+                    case BRUSH:
                         R_DrawBrushModel(currententity);
                         break;
-                    case mod_sprite :
+                    case SPRITE:
                         R_DrawSpriteModel(currententity);
                         break;
                     default :
diff --git a/src/main/java/lwjake2/render/lwjgl/Model.java b/src/main/java/lwjake2/render/lwjgl/Model.java
index 52b6301..32d6066 100644
--- a/src/main/java/lwjake2/render/lwjgl/Model.java
+++ b/src/main/java/lwjake2/render/lwjgl/Model.java
@@ -19,6 +19,7 @@
 package lwjake2.render.lwjgl;
 
 import dmx.lwjake2.render.ImageType;
+import dmx.lwjake2.render.ModelType;
 import lwjake2.Defines;
 import lwjake2.ErrorCode;
 import lwjake2.client.VID;
@@ -953,7 +954,7 @@ public abstract class Model extends Surf {
         qfiles.dheader_t    header;
         mmodel_t bm;
     
-        loadmodel.type = mod_brush;
+        loadmodel.type = ModelType.BRUSH;
         if (loadmodel != mod_known[0])
             Com.Error(ErrorCode.ERR_DROP, "Loaded a brush model after the world");
 
@@ -1089,7 +1090,7 @@ public abstract class Model extends Surf {
             }
         }
 
-        mod.type = mod_alias;
+        mod.type = ModelType.ALIAS;
 
         //
         // load the glcmds
@@ -1163,7 +1164,7 @@ public abstract class Model extends Surf {
             mod.skins[i] = GL_FindImage(sprout.frames[i].name, SPRITE);
         }
 
-        mod.type = mod_sprite;
+        mod.type = ModelType.SPRITE;
         mod.extradata = sprout;
     }
 
@@ -1218,13 +1219,13 @@ public abstract class Model extends Surf {
             mod.registration_sequence = registration_sequence;
 
             // register any images used by the models
-            if (mod.type == mod_sprite)
+            if (mod.type == ModelType.SPRITE)
             {
                 sprout = (qfiles.dsprite_t)mod.extradata;
                 for (i=0 ; i<sprout.numframes ; i++)
                     mod.skins[i] = GL_FindImage(sprout.frames[i].name, SPRITE);
             }
-            else if (mod.type == mod_alias)
+            else if (mod.type == ModelType.ALIAS)
             {
                 pheader = (qfiles.dmdl_t)mod.extradata;
                 for (i=0 ; i<pheader.num_skins ; i++)
@@ -1233,7 +1234,7 @@ public abstract class Model extends Surf {
                 mod.numframes = pheader.num_frames;
                 // PGM
             }
-            else if (mod.type == mod_brush)
+            else if (mod.type == ModelType.BRUSH)
             {
                 for (i=0 ; i<mod.numtexinfo ; i++)
                     mod.texinfo[i].image.registration_sequence = registration_sequence;
@@ -1263,7 +1264,7 @@ public abstract class Model extends Surf {
                 Mod_Free(mod);
             } else {
                 // precompile AliasModels
-                if (mod.type == mod_alias)
+                if (mod.type == ModelType.ALIAS)
                     precompileGLCmds((qfiles.dmdl_t)mod.extradata);
             }
         }
diff --git a/src/main/java/lwjake2/render/model_t.java b/src/main/java/lwjake2/render/model_t.java
index 88cb4af..df98800 100644
--- a/src/main/java/lwjake2/render/model_t.java
+++ b/src/main/java/lwjake2/render/model_t.java
@@ -18,6 +18,7 @@
 
 package lwjake2.render;
 
+import dmx.lwjake2.render.ModelType;
 import lwjake2.Defines;
 import lwjake2.game.cplane_t;
 import lwjake2.qcommon.qfiles;
@@ -32,8 +33,7 @@ public class model_t implements Cloneable {
 
     public int registration_sequence;
 
-    // was enum modtype_t
-    public int type;
+    public ModelType type;
     public int numframes;
 
     public int flags;
@@ -104,8 +104,7 @@ public class model_t implements Cloneable {
         name = "";
         registration_sequence = 0;
 
-        // was enum modtype_t
-        type = 0;
+        type = ModelType.BAD;
         numframes = 0;
         flags = 0;