viewer: rename simple_model to hob_mesh, move mesh rendering code to model class.

Also don't crash if hmt cannot be found

hob_display/hob_mesh.pas

@@ -1,4 +1,4 @@
-unit simple_model;
+unit hob_mesh;
 {$mode objfpc}{$H+}
 
 interface
@@ -31,7 +31,16 @@ type
   TPolyList = specialize TGenericStructList<TQuad>;
   TMaterialArray = array of TMaterial;
 
-  { TModel }
+  TRenderOpts = record
+      wireframe: boolean;
+      points: boolean;
+      vcolors: boolean;
+      textures: boolean;
+  end;
+
+  { TModel
+    single HOB mesh
+  }
 
   TModel = class
     private
@@ -40,6 +49,7 @@ type
       _quads: TPolyList;
       _materials: array of TMaterial;
       _hmt: THmtFile;
+      _hmt_loaded: boolean;
       procedure HmtRead(const filename: string);
       procedure HobRead(const filename: string);
       procedure HobReadMesh(const mesh: THobObject);
@@ -51,6 +61,7 @@ type
       function GetVertices: TVertexList;
       function GetMaterials: TMaterialArray;
       procedure InitGL;
+      procedure DrawGL(opts: TRenderOpts);
   end;
 
 implementation
@@ -177,8 +188,13 @@ begin
   _quads := TPolyList.Create;
   WriteLn('Loading mesh file ', hob_filename);
   HobRead(hob_filename);
+  if FileExists(hmt_filename) then begin
       WriteLn('Loading material file ', hmt_filename);
       HmtRead(hmt_filename);
+      _hmt_loaded := true;
+  end else begin
+      _hmt_loaded := false;
+  end;
 end;
 
 function TModel.GetTriangles: TPolyList;
@@ -254,11 +270,80 @@ procedure TModel.InitGL;
 var
   i: integer;
 begin
+  if not _hmt_loaded then
+      exit;
   for i := 0 to _hmt.material_count - 1 do begin
       if _materials[i].has_texture then
           GenTexture(_materials[i]);
   end;
 end;
 
+
+procedure TModel.DrawGL(opts: TRenderOpts);
+var
+  verts: TVertexList;
+  vert: TVertex;
+  polygons: TPolyList;
+  i: integer;
+  mats: array of TMaterial;
+
+  procedure DrawPoly(quad: TQuad; elements: integer);
+  var
+    mat: TMaterial;
+    k: Integer;
+  begin
+    if _hmt_loaded then begin
+        mat := mats[quad.material_index];
+        if mat.has_texture then begin
+            glEnable(GL_TEXTURE_2D);
+            glBindTexture(GL_TEXTURE_2D, mat.gl_tex_id);
+        end else
+            glDisable(GL_TEXTURE_2D);
+    end;
+
+    if elements = 3 then
+        glBegin( GL_TRIANGLES )
+    else
+        glBegin( GL_QUADS );
+    for k := 0 to elements - 1 do begin
+        if opts.vcolors then
+            glColor4ubv(@quad.colors[k]);
+        if opts.textures then
+            glTexCoord2fv(@quad.tex_coords[k, 0]);
+        glVertex3fv(@quad.vertices[k]);
+    end;
+    glEnd;
+  end;
+
+begin
+  if opts.wireframe then
+      glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)
+  else
+      glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+
+  glDisable(GL_TEXTURE_2D);
+  if opts.points then begin
+      verts := GetVertices;
+      glBegin( GL_POINTS );
+      glColor3f(0, 1, 0);
+      for i := 0 to verts.Count - 1 do begin
+          vert := verts[i];
+          glVertex3fv(@vert);
+      end;
+      glEnd;
+  end;
+
+  glColor3f(1, 1, 1);
+  mats := GetMaterials;
+
+  polygons := GetTriangles;
+  for i := 0 to polygons.Count - 1 do
+      DrawPoly(polygons[i], 3);
+
+  polygons := GetQuads;
+  for i := 0 to polygons.Count - 1 do
+      DrawPoly(polygons[i], 4);
+end;
+
 end.
 

hob_display/hob_viewer.lpi

@@ -44,9 +44,9 @@
         <UnitName Value="hob_viewer"/>
       </Unit0>
       <Unit1>
-        <Filename Value="simple_model.pas"/>
+        <Filename Value="hob_mesh.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="simple_model"/>
+        <UnitName Value="hob_mesh"/>
       </Unit1>
       <Unit2>
         <Filename Value="hob_parser.pas"/>
@@ -61,7 +61,6 @@
       <Unit4>
         <Filename Value="rs_image.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="rs_image"/>
       </Unit4>
     </Units>
   </ProjectOptions>
@@ -76,9 +75,6 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Other>
-      <CompilerMessages>
-        <MsgFileName Value=""/>
-      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

hob_display/hob_viewer.pas

@@ -22,7 +22,7 @@ program hob_viewer;
 uses
   sysutils,
   gl, glu, glext, sdl,
-  simple_model, GenericStructList, hob_parser, hmt_parser, rs_image;
+  hob_mesh, GenericStructList, hob_parser, hmt_parser, rs_image;
 
 const
   SCR_W_fscrn = 1024;
@@ -46,12 +46,9 @@ var
       rotation_angle: single;
       distance: single;
       pitch: single;
-      wireframe: boolean;
-      points: boolean;
-      vcolors: boolean;
-      textures: boolean;
-      autorotate: boolean;
       x, y: single;
+      autorotate: boolean;
+      opts: TRenderOpts;
   end;
 
   key_pressed: record
@@ -117,65 +114,6 @@ begin
   glLoadIdentity;                // Reset The View
 end;
 
-procedure DrawModel;
-var
-  verts: TVertexList;
-  vert: TVertex;
-  polygons: TPolyList;
-  i: integer;
-  mats: array of TMaterial;
-
-  procedure DrawPoly(quad: TQuad; elements: integer);
-  var
-    mat: TMaterial;
-    k: Integer;
-  begin
-    mat := mats[quad.material_index];
-    if mat.has_texture then begin
-        glEnable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, mat.gl_tex_id);
-    end else
-        glDisable(GL_TEXTURE_2D);
-
-    if elements = 3 then
-        glBegin( GL_TRIANGLES )
-    else
-        glBegin( GL_QUADS );
-    for k := 0 to elements - 1 do begin
-        if view.vcolors then
-            glColor4ubv(@quad.colors[k]);
-        if view.textures then
-            glTexCoord2fv(@quad.tex_coords[k, 0]);
-        glVertex3fv(@quad.vertices[k]);
-    end;
-    glEnd;
-  end;
-
-begin
-  glDisable(GL_TEXTURE_2D);
-  if view.points then begin
-      verts := model.GetVertices;
-      glBegin( GL_POINTS );
-      glColor3f(0, 1, 0);
-      for i := 0 to verts.Count - 1 do begin
-          vert := verts[i];
-          glVertex3fv(@vert);
-      end;
-      glEnd;
-  end;
-
-  glColor3f(1, 1, 1);
-  mats := model.GetMaterials;
-
-  polygons := model.GetTriangles;
-  for i := 0 to polygons.Count - 1 do
-      DrawPoly(polygons[i], 3);
-
-  polygons := model.GetQuads;
-  for i := 0 to polygons.Count - 1 do
-      DrawPoly(polygons[i], 4);
-end;
-
 
 // The main drawing function.
 procedure DrawGLScene;
@@ -195,18 +133,12 @@ begin
   if view.rotation_angle > 360 then
       view.rotation_angle -= 360;
 
-  if view.wireframe then
+  model.DrawGL(view.opts);
-      glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)
-  else
-      glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-
-  DrawModel;
   
   SDL_GL_SwapBuffers;
 end;
 
 
-
 procedure SetMode(w, h: word; fullscreen: boolean = false);
 var
   flags: UInt32;
@@ -221,6 +153,7 @@ begin
   SDL_WM_SetCaption('HOB viewer', nil);
 end;
 
+
 procedure WindowScreenshot(const width, height : integer);
 const
   head: array[0..8] of word = (0, 2, 0, 0, 0, 0, 0, 0, 24);
@@ -247,6 +180,7 @@ begin
   Freemem(buf);
 end;
 
+
 procedure InitView;
 begin
   view.rotation_angle := 0;
@@ -254,11 +188,11 @@ begin
   view.pitch := 0;
   view.x := 0;
   view.y := 0;
-  view.wireframe := false;
-  view.points := false;
   view.autorotate := true;
-  view.vcolors := true;
+  view.opts.wireframe := false;
-  view.textures := true;
+  view.opts.points := false;
+  view.opts.vcolors := true;
+  view.opts.textures := true;
 end;
 
 
@@ -300,31 +234,33 @@ begin
                  view.distance += ZoomIncrement;
              SDLK_PAGEDOWN:
                  view.distance -= ZoomIncrement;
-             SDLK_w:
-                 if not key_pressed.wireframe then begin
-                     view.wireframe := not view.wireframe;
-                     key_pressed.wireframe := true;
-                 end;
-             SDLK_v:
-                 if not key_pressed.vcolors then begin
-                     view.vcolors := not view.vcolors;
-                     key_pressed.vcolors := true;
-                 end;
-             SDLK_p:
-                 if not key_pressed.points then begin
-                     view.points := not view.points;
-                     key_pressed.points := true;
-                 end;
-             SDLK_t:
-                 if not key_pressed.textures then begin
-                     view.textures := not view.textures;
-                     key_pressed.textures := true;
-                 end;
              SDLK_r:
                  if not key_pressed.autorotate then begin
                      view.autorotate := not view.autorotate;
                      key_pressed.autorotate := true;
                  end;
+
+             //model rendering opts
+             SDLK_w:
+                 if not key_pressed.wireframe then begin
+                     view.opts.wireframe := not view.opts.wireframe;
+                     key_pressed.wireframe := true;
+                 end;
+             SDLK_v:
+                 if not key_pressed.vcolors then begin
+                     view.opts.vcolors := not view.opts.vcolors;
+                     key_pressed.vcolors := true;
+                 end;
+             SDLK_p:
+                 if not key_pressed.points then begin
+                     view.opts.points := not view.opts.points;
+                     key_pressed.points := true;
+                 end;
+             SDLK_t:
+                 if not key_pressed.textures then begin
+                     view.opts.textures := not view.opts.textures;
+                     key_pressed.textures := true;
+                 end;
            end;
 
        SDL_KEYUP:
@@ -385,7 +321,7 @@ begin
                end;
            end;
        end;
-   end;
+   end; {case}
 end;
 
 //******************************************************************************
@@ -422,8 +358,6 @@ begin
   key_pressed.fullscreen := false;
   while not Done do begin
       HandleEvent;
-
-      // draw the scene
       DrawGLScene;
       frames += 1;
       if (SDL_GetTicks - sec) >= 1000 then begin