]> de.git.xonotic.org Git - voretournament/voretournament.git/blobdiff - misc/mediasource/extra/netradiant-src/radiant/patchmanip.cpp
Include netRadiant source in this GIT
[voretournament/voretournament.git] / misc / mediasource / extra / netradiant-src / radiant / patchmanip.cpp
diff --git a/misc/mediasource/extra/netradiant-src/radiant/patchmanip.cpp b/misc/mediasource/extra/netradiant-src/radiant/patchmanip.cpp
new file mode 100644 (file)
index 0000000..b8bccee
--- /dev/null
@@ -0,0 +1,1149 @@
+/*
+Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+For a list of contributors, see the accompanying CONTRIBUTORS file.
+
+This file is part of GtkRadiant.
+
+GtkRadiant is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+GtkRadiant is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GtkRadiant; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "patchmanip.h"
+
+#include "debugging/debugging.h"
+
+
+#include "iselection.h"
+#include "ipatch.h"
+
+#include "math/vector.h"
+#include "math/aabb.h"
+#include "generic/callback.h"
+
+#include "gtkutil/menu.h"
+#include "gtkutil/image.h"
+#include "map.h"
+#include "mainframe.h"
+#include "commands.h"
+#include "gtkmisc.h"
+#include "gtkdlgs.h"
+#include "texwindow.h"
+#include "xywindow.h"
+#include "select.h"
+#include "patch.h"
+#include "grid.h"
+
+PatchCreator* g_patchCreator = 0;
+
+void Scene_PatchConstructPrefab(scene::Graph& graph, const AABB aabb, const char* shader, EPatchPrefab eType, int axis, std::size_t width = 3, std::size_t height = 3)
+{
+  Select_Delete();
+  GlobalSelectionSystem().setSelectedAll(false);
+
+  NodeSmartReference node(g_patchCreator->createPatch());
+  Node_getTraversable(Map_FindOrInsertWorldspawn(g_map))->insert(node);
+
+  Patch* patch = Node_getPatch(node);
+  patch->SetShader(shader);
+
+  patch->ConstructPrefab(aabb, eType, axis, width, height);
+  patch->controlPointsChanged();
+
+  {
+    scene::Path patchpath(makeReference(GlobalSceneGraph().root()));
+    patchpath.push(makeReference(*Map_GetWorldspawn(g_map)));
+    patchpath.push(makeReference(node.get()));
+    Instance_getSelectable(*graph.find(patchpath))->setSelected(true);
+  }
+}
+
+
+void Patch_makeCaps(Patch& patch, scene::Instance& instance, EPatchCap type, const char* shader)
+{
+  if((type == eCapEndCap || type == eCapIEndCap)
+    && patch.getWidth() != 5)
+  {
+    globalErrorStream() << "cannot create end-cap - patch width != 5\n";
+    return;
+  }
+  if((type == eCapBevel || type == eCapIBevel)
+    && patch.getWidth() != 3 && patch.getWidth() != 5)
+  {
+    globalErrorStream() << "cannot create bevel-cap - patch width != 3\n";
+    return;
+  }
+  if(type == eCapCylinder
+    && patch.getWidth() != 9)
+  {
+    globalErrorStream() << "cannot create cylinder-cap - patch width != 9\n";
+    return;
+  }
+
+  {
+    NodeSmartReference cap(g_patchCreator->createPatch());
+    Node_getTraversable(instance.path().parent())->insert(cap);
+
+    patch.MakeCap(Node_getPatch(cap), type, ROW, true);
+    Node_getPatch(cap)->SetShader(shader);
+
+    scene::Path path(instance.path());
+    path.pop();
+    path.push(makeReference(cap.get()));
+    selectPath(path, true);
+  }
+
+  {
+    NodeSmartReference cap(g_patchCreator->createPatch());
+    Node_getTraversable(instance.path().parent())->insert(cap);
+
+    patch.MakeCap(Node_getPatch(cap), type, ROW, false);
+    Node_getPatch(cap)->SetShader(shader);
+
+    scene::Path path(instance.path());
+    path.pop();
+    path.push(makeReference(cap.get()));
+    selectPath(path, true);
+  }
+}
+
+typedef std::vector<scene::Instance*> InstanceVector;
+
+class PatchStoreInstance
+{
+  InstanceVector& m_instances;
+public:
+  PatchStoreInstance(InstanceVector& instances) : m_instances(instances)
+  {
+  }
+  void operator()(PatchInstance& patch) const
+  {
+    m_instances.push_back(&patch);
+  }
+};
+
+enum ECapDialog {
+  PATCHCAP_BEVEL = 0,
+  PATCHCAP_ENDCAP,
+  PATCHCAP_INVERTED_BEVEL,
+  PATCHCAP_INVERTED_ENDCAP,
+  PATCHCAP_CYLINDER
+};
+
+EMessageBoxReturn DoCapDlg(ECapDialog *type);
+
+void Scene_PatchDoCap_Selected(scene::Graph& graph, const char* shader)
+{
+  ECapDialog nType;
+
+  if(DoCapDlg(&nType) == eIDOK)
+  {
+    EPatchCap eType;
+    switch(nType)
+    {
+    case PATCHCAP_INVERTED_BEVEL:
+      eType = eCapIBevel;
+      break;
+    case PATCHCAP_BEVEL:
+      eType = eCapBevel;
+      break;
+    case PATCHCAP_INVERTED_ENDCAP:
+      eType = eCapIEndCap;
+      break;
+    case PATCHCAP_ENDCAP:
+      eType = eCapEndCap;
+      break;
+    case PATCHCAP_CYLINDER:
+      eType = eCapCylinder;
+      break;
+    default:
+      ERROR_MESSAGE("invalid patch cap type");
+      return;
+    }
+  
+    InstanceVector instances;
+    Scene_forEachVisibleSelectedPatchInstance(PatchStoreInstance(instances));
+    for(InstanceVector::const_iterator i = instances.begin(); i != instances.end(); ++i)
+    {
+      Patch_makeCaps(* Node_getPatch((*i)->path().top()), *(*i), eType, shader);
+    }
+  }
+}
+
+Patch* Scene_GetUltimateSelectedVisiblePatch()
+{
+  if(GlobalSelectionSystem().countSelected() != 0)
+  {
+    scene::Node& node = GlobalSelectionSystem().ultimateSelected().path().top();
+    if(node.visible())
+    {
+      return Node_getPatch(node);
+    }
+  }
+  return 0;
+}
+
+
+class PatchCapTexture
+{
+public:
+  void operator()(Patch& patch) const
+  {
+    patch.ProjectTexture(Patch::m_CycleCapIndex);
+  }
+};
+
+void Scene_PatchCapTexture_Selected(scene::Graph& graph)
+{
+  Scene_forEachVisibleSelectedPatch(PatchCapTexture());
+  Patch::m_CycleCapIndex = (Patch::m_CycleCapIndex == 0) ? 1 : (Patch::m_CycleCapIndex == 1) ? 2 : 0;
+  SceneChangeNotify();
+}
+
+class PatchFlipTexture
+{
+  int m_axis;
+public:
+  PatchFlipTexture(int axis) : m_axis(axis)
+  {
+  }
+  void operator()(Patch& patch) const
+  {
+    patch.FlipTexture(m_axis);
+  }
+};
+
+void Scene_PatchFlipTexture_Selected(scene::Graph& graph, int axis)
+{
+  Scene_forEachVisibleSelectedPatch(PatchFlipTexture(axis));
+}
+
+class PatchNaturalTexture
+{
+public:
+  void operator()(Patch& patch) const
+  {
+    patch.NaturalTexture();
+  }
+};
+
+void Scene_PatchNaturalTexture_Selected(scene::Graph& graph)
+{
+  Scene_forEachVisibleSelectedPatch(PatchNaturalTexture());
+  SceneChangeNotify();
+}
+
+
+class PatchInsertRemove
+{
+  bool m_insert, m_column, m_first;
+public:
+  PatchInsertRemove(bool insert, bool column, bool first) : m_insert(insert), m_column(column), m_first(first)
+  {
+  }
+  void operator()(Patch& patch) const
+  {
+    patch.InsertRemove(m_insert, m_column, m_first);
+  }
+};
+
+void Scene_PatchInsertRemove_Selected(scene::Graph& graph, bool bInsert, bool bColumn, bool bFirst)
+{
+  Scene_forEachVisibleSelectedPatch(PatchInsertRemove(bInsert, bColumn, bFirst));
+}
+
+class PatchInvertMatrix
+{
+public:
+  void operator()(Patch& patch) const
+  {
+    patch.InvertMatrix();
+  }
+};
+
+void Scene_PatchInvert_Selected(scene::Graph& graph)
+{
+  Scene_forEachVisibleSelectedPatch(PatchInvertMatrix());
+}
+
+class PatchRedisperse
+{
+  EMatrixMajor m_major;
+public:
+  PatchRedisperse(EMatrixMajor major) : m_major(major)
+  {
+  }
+  void operator()(Patch& patch) const
+  {
+    patch.Redisperse(m_major);
+  }
+};
+
+void Scene_PatchRedisperse_Selected(scene::Graph& graph, EMatrixMajor major)
+{
+  Scene_forEachVisibleSelectedPatch(PatchRedisperse(major));
+}
+
+class PatchSmooth
+{
+  EMatrixMajor m_major;
+public:
+  PatchSmooth(EMatrixMajor major) : m_major(major)
+  {
+  }
+  void operator()(Patch& patch) const
+  {
+    patch.Smooth(m_major);
+  }
+};
+
+void Scene_PatchSmooth_Selected(scene::Graph& graph, EMatrixMajor major)
+{
+  Scene_forEachVisibleSelectedPatch(PatchSmooth(major));
+}
+
+class PatchTransposeMatrix
+{
+public:
+  void operator()(Patch& patch) const
+  {
+    patch.TransposeMatrix();
+  }
+};
+
+void Scene_PatchTranspose_Selected(scene::Graph& graph)
+{
+  Scene_forEachVisibleSelectedPatch(PatchTransposeMatrix());
+}
+
+class PatchSetShader
+{
+  const char* m_name;
+public:
+  PatchSetShader(const char* name)
+    : m_name(name)
+  {
+  }
+  void operator()(Patch& patch) const
+  {
+    patch.SetShader(m_name);
+  }
+};
+
+void Scene_PatchSetShader_Selected(scene::Graph& graph, const char* name)
+{
+  Scene_forEachVisibleSelectedPatch(PatchSetShader(name));
+  SceneChangeNotify();
+}
+
+void Scene_PatchGetShader_Selected(scene::Graph& graph, CopiedString& name)
+{
+  Patch* patch = Scene_GetUltimateSelectedVisiblePatch();
+  if(patch != 0)
+  {
+    name = patch->GetShader();
+  }
+}
+
+class PatchSelectByShader
+{
+  const char* m_name;
+public:
+  inline PatchSelectByShader(const char* name)
+    : m_name(name)
+  {
+  }
+  void operator()(PatchInstance& patch) const
+  {
+    if(shader_equal(patch.getPatch().GetShader(), m_name))
+    {
+      patch.setSelected(true);
+    }
+  }
+};
+
+void Scene_PatchSelectByShader(scene::Graph& graph, const char* name)
+{
+  Scene_forEachVisiblePatchInstance(PatchSelectByShader(name));
+}
+
+
+class PatchFindReplaceShader
+{
+  const char* m_find;
+  const char* m_replace;
+public:
+  PatchFindReplaceShader(const char* find, const char* replace) : m_find(find), m_replace(replace)
+  {
+  }
+  void operator()(Patch& patch) const
+  {
+    if(shader_equal(patch.GetShader(), m_find))
+    {
+      patch.SetShader(m_replace);
+    }
+  }
+};
+
+void Scene_PatchFindReplaceShader(scene::Graph& graph, const char* find, const char* replace)
+{
+  Scene_forEachVisiblePatch(PatchFindReplaceShader(find, replace));
+}
+
+void Scene_PatchFindReplaceShader_Selected(scene::Graph& graph, const char* find, const char* replace)
+{
+  Scene_forEachVisibleSelectedPatch(PatchFindReplaceShader(find, replace));
+}
+
+
+AABB PatchCreator_getBounds()
+{
+  AABB aabb(aabb_for_minmax(Select_getWorkZone().d_work_min, Select_getWorkZone().d_work_max));
+
+  float gridSize = GetGridSize();
+
+  if(aabb.extents[0] == 0)
+  {
+    aabb.extents[0] = gridSize;
+  }
+  if(aabb.extents[1] == 0)
+  {
+    aabb.extents[1] = gridSize;
+  }
+  if(aabb.extents[2] == 0)
+  {
+    aabb.extents[2] = gridSize;
+  }
+
+  if(aabb_valid(aabb))
+  {
+    return aabb;
+  }
+  return AABB(Vector3(0, 0, 0), Vector3(64, 64, 64));
+}
+
+void Patch_Cylinder()
+{
+  UndoableCommand undo("patchCreateCylinder");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eCylinder, GlobalXYWnd_getCurrentViewType());
+}
+
+void Patch_DenseCylinder()
+{
+  UndoableCommand undo("patchCreateDenseCylinder");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eDenseCylinder, GlobalXYWnd_getCurrentViewType());
+}
+
+void Patch_VeryDenseCylinder()
+{
+  UndoableCommand undo("patchCreateVeryDenseCylinder");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eVeryDenseCylinder, GlobalXYWnd_getCurrentViewType());
+}
+
+void Patch_SquareCylinder()
+{
+  UndoableCommand undo("patchCreateSquareCylinder");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eSqCylinder, GlobalXYWnd_getCurrentViewType());
+}
+
+void Patch_Endcap()
+{
+  UndoableCommand undo("patchCreateCaps");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eEndCap, GlobalXYWnd_getCurrentViewType());
+}
+
+void Patch_Bevel()
+{
+  UndoableCommand undo("patchCreateBevel");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eBevel, GlobalXYWnd_getCurrentViewType());
+}
+
+void Patch_Sphere()
+{
+  UndoableCommand undo("patchCreateSphere");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eSphere, GlobalXYWnd_getCurrentViewType());
+}
+
+void Patch_SquareBevel()
+{
+}
+
+void Patch_SquareEndcap()
+{
+}
+
+void Patch_Cone()
+{
+  UndoableCommand undo("patchCreateCone");
+
+  Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eCone, GlobalXYWnd_getCurrentViewType());
+}
+
+void DoNewPatchDlg();
+
+void Patch_Plane()
+{
+  UndoableCommand undo("patchCreatePlane");
+
+  DoNewPatchDlg();
+}
+
+void Patch_InsertInsertColumn()
+{
+  UndoableCommand undo("patchInsertColumns");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), true, true, false);
+}
+
+void Patch_InsertAddColumn()
+{
+  UndoableCommand undo("patchAddColumns");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), true, true, true);
+}
+
+void Patch_InsertInsertRow()
+{
+  UndoableCommand undo("patchInsertRows");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), true, false, false);
+}
+
+void Patch_InsertAddRow()
+{
+  UndoableCommand undo("patchAddRows");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), true, false, true);
+}
+
+void Patch_DeleteFirstColumn()
+{
+  UndoableCommand undo("patchDeleteFirstColumns");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), false, true, true);
+}
+
+void Patch_DeleteLastColumn()
+{
+  UndoableCommand undo("patchDeleteLastColumns");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), false, true, false);
+}
+
+void Patch_DeleteFirstRow()
+{
+  UndoableCommand undo("patchDeleteFirstRows");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), false, false, true);
+}
+
+void Patch_DeleteLastRow()
+{
+  UndoableCommand undo("patchDeleteLastRows");
+
+  Scene_PatchInsertRemove_Selected(GlobalSceneGraph(), false, false, false);
+}
+
+void Patch_Invert()
+{
+  UndoableCommand undo("patchInvert");
+
+  Scene_PatchInvert_Selected(GlobalSceneGraph());
+}
+
+void Patch_RedisperseRows()
+{
+  UndoableCommand undo("patchRedisperseRows");
+
+  Scene_PatchRedisperse_Selected(GlobalSceneGraph(), ROW);
+}
+
+void Patch_RedisperseCols()
+{
+  UndoableCommand undo("patchRedisperseColumns");
+
+  Scene_PatchRedisperse_Selected(GlobalSceneGraph(), COL);
+}
+
+void Patch_SmoothRows()
+{
+  UndoableCommand undo("patchSmoothRows");
+
+  Scene_PatchSmooth_Selected(GlobalSceneGraph(), ROW);
+}
+
+void Patch_SmoothCols()
+{
+  UndoableCommand undo("patchSmoothColumns");
+
+  Scene_PatchSmooth_Selected(GlobalSceneGraph(), COL);
+}
+
+void Patch_Transpose()
+{
+  UndoableCommand undo("patchTranspose");
+
+  Scene_PatchTranspose_Selected(GlobalSceneGraph());
+}
+
+void Patch_Cap()
+{
+  // FIXME: add support for patch cap creation
+  // Patch_CapCurrent();
+  UndoableCommand undo("patchCreateCaps");
+
+  Scene_PatchDoCap_Selected(GlobalSceneGraph(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()));
+}
+
+void Patch_CycleProjection()
+{
+  UndoableCommand undo("patchCycleUVProjectionAxis");
+
+  Scene_PatchCapTexture_Selected(GlobalSceneGraph());
+}
+
+///\todo Unfinished.
+void Patch_OverlayOn()
+{
+}
+
+///\todo Unfinished.
+void Patch_OverlayOff()
+{
+}
+
+void Patch_FlipTextureX()
+{
+  UndoableCommand undo("patchFlipTextureU");
+
+  Scene_PatchFlipTexture_Selected(GlobalSceneGraph(), 0);
+}
+
+void Patch_FlipTextureY()
+{
+  UndoableCommand undo("patchFlipTextureV");
+
+  Scene_PatchFlipTexture_Selected(GlobalSceneGraph(), 1);
+}
+
+void Patch_NaturalTexture()
+{
+  UndoableCommand undo("patchNaturalTexture");
+
+  Scene_PatchNaturalTexture_Selected(GlobalSceneGraph());
+}
+
+
+
+
+#include "ifilter.h"
+
+
+class filter_patch_all : public PatchFilter
+{
+public:
+  bool filter(const Patch& patch) const
+  {
+    return true;
+  }
+};
+
+class filter_patch_shader : public PatchFilter
+{
+  const char* m_shader;
+public:
+  filter_patch_shader(const char* shader) : m_shader(shader)
+  {
+  }
+  bool filter(const Patch& patch) const
+  {
+    return shader_equal(patch.GetShader(), m_shader);
+  }
+};
+
+class filter_patch_flags : public PatchFilter
+{
+  int m_flags;
+public:
+  filter_patch_flags(int flags) : m_flags(flags)
+  {
+  }
+  bool filter(const Patch& patch) const
+  {
+    return (patch.getShaderFlags() & m_flags) != 0;
+  }
+};
+
+
+filter_patch_all g_filter_patch_all;
+filter_patch_shader g_filter_patch_clip("textures/common/clip");
+filter_patch_shader g_filter_patch_weapclip("textures/common/weapclip");
+filter_patch_flags g_filter_patch_translucent(QER_TRANS);
+
+void PatchFilters_construct()
+{
+  add_patch_filter(g_filter_patch_all, EXCLUDE_CURVES);
+  add_patch_filter(g_filter_patch_clip, EXCLUDE_CLIP);
+  add_patch_filter(g_filter_patch_weapclip, EXCLUDE_CLIP);
+  add_patch_filter(g_filter_patch_translucent, EXCLUDE_TRANSLUCENT);
+}
+
+
+#include "preferences.h"
+
+void Patch_constructPreferences(PreferencesPage& page)
+{
+  page.appendEntry("Patch Subdivide Threshold", g_PatchSubdivideThreshold);
+}
+void Patch_constructPage(PreferenceGroup& group)
+{
+  PreferencesPage page(group.createPage("Patches", "Patch Display Preferences"));
+  Patch_constructPreferences(page);
+}
+void Patch_registerPreferencesPage()
+{
+  PreferencesDialog_addDisplayPage(FreeCaller1<PreferenceGroup&, Patch_constructPage>());
+}
+
+
+#include "preferencesystem.h"
+
+void PatchPreferences_construct()
+{
+  GlobalPreferenceSystem().registerPreference("Subdivisions", IntImportStringCaller(g_PatchSubdivideThreshold), IntExportStringCaller(g_PatchSubdivideThreshold));
+}
+
+
+#include "generic/callback.h"
+
+void Patch_registerCommands()
+{
+  GlobalCommands_insert("InvertCurveTextureX", FreeCaller<Patch_FlipTextureX>(), Accelerator('I', (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+  GlobalCommands_insert("InvertCurveTextureY", FreeCaller<Patch_FlipTextureY>(), Accelerator('I', (GdkModifierType)GDK_SHIFT_MASK));
+  GlobalCommands_insert("IncPatchColumn", FreeCaller<Patch_InsertInsertColumn>(), Accelerator(GDK_KP_Add, (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+  GlobalCommands_insert("IncPatchRow", FreeCaller<Patch_InsertInsertRow>(), Accelerator(GDK_KP_Add, (GdkModifierType)GDK_CONTROL_MASK));
+  GlobalCommands_insert("DecPatchColumn", FreeCaller<Patch_DeleteLastColumn>(), Accelerator(GDK_KP_Subtract, (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+  GlobalCommands_insert("DecPatchRow", FreeCaller<Patch_DeleteLastRow>(), Accelerator(GDK_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK));
+  GlobalCommands_insert("NaturalizePatch", FreeCaller<Patch_NaturalTexture>(), Accelerator('N', (GdkModifierType)GDK_CONTROL_MASK));
+  GlobalCommands_insert("PatchCylinder", FreeCaller<Patch_Cylinder>());
+  GlobalCommands_insert("PatchDenseCylinder", FreeCaller<Patch_DenseCylinder>());
+  GlobalCommands_insert("PatchVeryDenseCylinder", FreeCaller<Patch_VeryDenseCylinder>());
+  GlobalCommands_insert("PatchSquareCylinder", FreeCaller<Patch_SquareCylinder>());
+  GlobalCommands_insert("PatchEndCap", FreeCaller<Patch_Endcap>());
+  GlobalCommands_insert("PatchBevel", FreeCaller<Patch_Bevel>());
+  GlobalCommands_insert("PatchSquareBevel", FreeCaller<Patch_SquareBevel>());
+  GlobalCommands_insert("PatchSquareEndcap", FreeCaller<Patch_SquareEndcap>());
+  GlobalCommands_insert("PatchCone", FreeCaller<Patch_Cone>());
+  GlobalCommands_insert("PatchSphere", FreeCaller<Patch_Sphere>());
+  GlobalCommands_insert("SimplePatchMesh", FreeCaller<Patch_Plane>(), Accelerator('P', (GdkModifierType)GDK_SHIFT_MASK));
+  GlobalCommands_insert("PatchInsertInsertColumn", FreeCaller<Patch_InsertInsertColumn>());
+  GlobalCommands_insert("PatchInsertAddColumn", FreeCaller<Patch_InsertAddColumn>());
+  GlobalCommands_insert("PatchInsertInsertRow", FreeCaller<Patch_InsertInsertRow>());
+  GlobalCommands_insert("PatchInsertAddRow", FreeCaller<Patch_InsertAddRow>());
+  GlobalCommands_insert("PatchDeleteFirstColumn", FreeCaller<Patch_DeleteFirstColumn>());
+  GlobalCommands_insert("PatchDeleteLastColumn", FreeCaller<Patch_DeleteLastColumn>());
+  GlobalCommands_insert("PatchDeleteFirstRow", FreeCaller<Patch_DeleteFirstRow>());
+  GlobalCommands_insert("PatchDeleteLastRow", FreeCaller<Patch_DeleteLastRow>());
+  GlobalCommands_insert("InvertCurve", FreeCaller<Patch_Invert>(), Accelerator('I', (GdkModifierType)GDK_CONTROL_MASK));
+  GlobalCommands_insert("RedisperseRows", FreeCaller<Patch_RedisperseRows>(), Accelerator('E', (GdkModifierType)GDK_CONTROL_MASK));
+  GlobalCommands_insert("RedisperseCols", FreeCaller<Patch_RedisperseCols>(), Accelerator('E', (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+  GlobalCommands_insert("SmoothRows", FreeCaller<Patch_SmoothRows>(), Accelerator('W', (GdkModifierType)GDK_CONTROL_MASK));
+  GlobalCommands_insert("SmoothCols", FreeCaller<Patch_SmoothCols>(), Accelerator('W', (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+  GlobalCommands_insert("MatrixTranspose", FreeCaller<Patch_Transpose>(), Accelerator('M', (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+  GlobalCommands_insert("CapCurrentCurve", FreeCaller<Patch_Cap>(), Accelerator('C', (GdkModifierType)GDK_SHIFT_MASK));
+  GlobalCommands_insert("CycleCapTexturePatch", FreeCaller<Patch_CycleProjection>(), Accelerator('N', (GdkModifierType)(GDK_SHIFT_MASK|GDK_CONTROL_MASK)));
+  GlobalCommands_insert("MakeOverlayPatch", FreeCaller<Patch_OverlayOn>(), Accelerator('Y'));
+  GlobalCommands_insert("ClearPatchOverlays", FreeCaller<Patch_OverlayOff>(), Accelerator('L', (GdkModifierType)GDK_CONTROL_MASK));
+}
+
+void Patch_constructToolbar(GtkToolbar* toolbar)
+{
+  toolbar_append_button(toolbar, "Put caps on the current patch (SHIFT + C)", "curve_cap.bmp", "CapCurrentCurve");
+}
+
+void Patch_constructMenu(GtkMenu* menu)
+{
+  create_menu_item_with_mnemonic(menu, "Cylinder", "PatchCylinder");
+  {
+    GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic (menu, "More Cylinders");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "Dense Cylinder", "PatchDenseCylinder");
+    create_menu_item_with_mnemonic(menu_in_menu, "Very Dense Cylinder", "PatchVeryDenseCylinder");
+    create_menu_item_with_mnemonic(menu_in_menu, "Square Cylinder", "PatchSquareCylinder");
+  }
+  menu_separator (menu);
+  create_menu_item_with_mnemonic(menu, "End cap", "PatchEndCap");
+  create_menu_item_with_mnemonic(menu, "Bevel", "PatchBevel");
+  {
+    GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic (menu, "More End caps, Bevels");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "Square Endcap", "PatchSquareBevel");
+    create_menu_item_with_mnemonic(menu_in_menu, "Square Bevel", "PatchSquareEndcap");
+  }
+  menu_separator (menu);
+  create_menu_item_with_mnemonic(menu, "Cone", "PatchCone");
+  create_menu_item_with_mnemonic(menu, "Sphere", "PatchSphere");
+  menu_separator (menu);
+  create_menu_item_with_mnemonic(menu, "Simple Patch Mesh...", "SimplePatchMesh");
+  menu_separator (menu);
+  {
+    GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic (menu, "Insert");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "Insert (2) Columns", "PatchInsertInsertColumn");
+    create_menu_item_with_mnemonic(menu_in_menu, "Add (2) Columns", "PatchInsertAddColumn");
+    menu_separator (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "Insert (2) Rows", "PatchInsertInsertRow");
+    create_menu_item_with_mnemonic(menu_in_menu, "Add (2) Rows", "PatchInsertAddRow");
+  }
+  {
+    GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic (menu, "Delete");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "First (2) Columns", "PatchDeleteFirstColumn");
+    create_menu_item_with_mnemonic(menu_in_menu, "Last (2) Columns", "PatchDeleteLastColumn");
+    menu_separator (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "First (2) Rows", "PatchDeleteFirstRow");
+    create_menu_item_with_mnemonic(menu_in_menu, "Last (2) Rows", "PatchDeleteLastRow");
+  }
+  menu_separator (menu);
+  {
+    GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic (menu, "Matrix");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "Invert", "InvertCurve");
+    GtkMenu* menu_3 = create_sub_menu_with_mnemonic (menu_in_menu, "Re-disperse");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_3);
+    create_menu_item_with_mnemonic(menu_3, "Rows", "RedisperseRows");
+    create_menu_item_with_mnemonic(menu_3, "Columns", "RedisperseCols");
+    GtkMenu* menu_4 = create_sub_menu_with_mnemonic (menu_in_menu, "Smooth");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_4);
+    create_menu_item_with_mnemonic(menu_4, "Rows", "SmoothRows");
+    create_menu_item_with_mnemonic(menu_4, "Columns", "SmoothCols");
+    create_menu_item_with_mnemonic(menu_in_menu, "Transpose", "MatrixTranspose");
+  }
+  menu_separator (menu);
+  create_menu_item_with_mnemonic(menu, "Cap Selection", "CapCurrentCurve");
+  create_menu_item_with_mnemonic(menu, "Cycle Cap Texture", "CycleCapTexturePatch");
+  menu_separator (menu);
+  {
+    GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic (menu, "Overlay");
+    if (g_Layout_enableDetachableMenus.m_value)
+      menu_tearoff (menu_in_menu);
+    create_menu_item_with_mnemonic(menu_in_menu, "Set", "MakeOverlayPatch");
+    create_menu_item_with_mnemonic(menu_in_menu, "Clear", "ClearPatchOverlays");
+  }
+}
+
+
+#include <gtk/gtkbox.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkradiobutton.h>
+#include <gtk/gtkcombobox.h>
+#include <gtk/gtklabel.h>
+#include "gtkutil/dialog.h"
+#include "gtkutil/widget.h"
+
+void DoNewPatchDlg()
+{
+  ModalDialog dialog;
+  GtkComboBox* width;
+  GtkComboBox* height;
+
+  GtkWindow* window = create_dialog_window(MainFrame_getWindow(), "Patch density", G_CALLBACK(dialog_delete_callback), &dialog);
+
+  GtkAccelGroup* accel = gtk_accel_group_new();
+  gtk_window_add_accel_group(window, accel);
+
+  {
+    GtkHBox* hbox = create_dialog_hbox(4, 4);
+    gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(hbox));
+    {
+      GtkTable* table = create_dialog_table(2, 2, 4, 4);
+      gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(table), TRUE, TRUE, 0);
+      {
+        GtkLabel* label = GTK_LABEL(gtk_label_new("Width:"));
+        gtk_widget_show(GTK_WIDGET(label));
+        gtk_table_attach(table, GTK_WIDGET(label), 0, 1, 0, 1,
+                          (GtkAttachOptions) (GTK_FILL),
+                          (GtkAttachOptions) (0), 0, 0);
+        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+      }
+      {
+        GtkLabel* label = GTK_LABEL(gtk_label_new("Height:"));
+        gtk_widget_show(GTK_WIDGET(label));
+        gtk_table_attach(table, GTK_WIDGET(label), 0, 1, 1, 2,
+                          (GtkAttachOptions) (GTK_FILL),
+                          (GtkAttachOptions) (0), 0, 0);
+        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+      }
+
+      {
+        GtkComboBox* combo = GTK_COMBO_BOX(gtk_combo_box_new_text());
+        gtk_combo_box_append_text(combo, "3");
+        gtk_combo_box_append_text(combo, "5");
+        gtk_combo_box_append_text(combo, "7");
+        gtk_combo_box_append_text(combo, "9");
+        gtk_combo_box_append_text(combo, "11");
+        gtk_combo_box_append_text(combo, "13");
+        gtk_combo_box_append_text(combo, "15");
+        gtk_combo_box_append_text(combo, "17");
+        gtk_combo_box_append_text(combo, "19");
+        gtk_combo_box_append_text(combo, "21");
+        gtk_combo_box_append_text(combo, "23");
+        gtk_combo_box_append_text(combo, "25");
+        gtk_combo_box_append_text(combo, "27");
+        gtk_combo_box_append_text(combo, "29");
+        gtk_combo_box_append_text(combo, "31"); // MAX_PATCH_SIZE is 32, so we should be able to do 31...
+        gtk_widget_show(GTK_WIDGET(combo));
+        gtk_table_attach(table, GTK_WIDGET(combo), 1, 2, 0, 1,
+                          (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                          (GtkAttachOptions) (0), 0, 0);
+
+        width = combo;
+      }
+      {
+        GtkComboBox* combo = GTK_COMBO_BOX(gtk_combo_box_new_text());
+        gtk_combo_box_append_text(combo, "3");
+        gtk_combo_box_append_text(combo, "5");
+        gtk_combo_box_append_text(combo, "7");
+        gtk_combo_box_append_text(combo, "9");
+        gtk_combo_box_append_text(combo, "11");
+        gtk_combo_box_append_text(combo, "13");
+        gtk_combo_box_append_text(combo, "15");
+        gtk_combo_box_append_text(combo, "17");
+        gtk_combo_box_append_text(combo, "19");
+        gtk_combo_box_append_text(combo, "21");
+        gtk_combo_box_append_text(combo, "23");
+        gtk_combo_box_append_text(combo, "25");
+        gtk_combo_box_append_text(combo, "27");
+        gtk_combo_box_append_text(combo, "29");
+        gtk_combo_box_append_text(combo, "31"); // MAX_PATCH_SIZE is 32, so we should be able to do 31...
+        gtk_widget_show(GTK_WIDGET(combo));
+        gtk_table_attach(table, GTK_WIDGET(combo), 1, 2, 1, 2,
+                          (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                          (GtkAttachOptions) (0), 0, 0);
+
+        height = combo;
+      }
+    }
+
+    {
+      GtkVBox* vbox = create_dialog_vbox(4);
+      gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(vbox), TRUE, TRUE, 0);
+      {
+        GtkButton* button = create_dialog_button("OK", G_CALLBACK(dialog_button_ok), &dialog);
+        gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(button), FALSE, FALSE, 0);
+        widget_make_default(GTK_WIDGET(button));
+        gtk_widget_grab_focus(GTK_WIDGET(button));
+        gtk_widget_add_accelerator(GTK_WIDGET(button), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0);
+      }
+      {
+        GtkButton* button = create_dialog_button("Cancel", G_CALLBACK(dialog_button_cancel), &dialog);
+        gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(button), FALSE, FALSE, 0);
+        gtk_widget_add_accelerator(GTK_WIDGET(button), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+      }
+    }
+  }
+
+  // Initialize dialog
+  gtk_combo_box_set_active(width, 0);
+  gtk_combo_box_set_active(height, 0);
+
+  if(modal_dialog_show(window, dialog) == eIDOK)
+  {
+    int w = gtk_combo_box_get_active(width) * 2 + 3;
+    int h = gtk_combo_box_get_active(height) * 2 + 3;
+
+    Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), ePlane, GlobalXYWnd_getCurrentViewType(), w, h);
+  }
+
+  gtk_widget_destroy(GTK_WIDGET(window));
+}
+
+
+
+
+EMessageBoxReturn DoCapDlg(ECapDialog* type)
+{
+  ModalDialog dialog;
+  ModalDialogButton ok_button(dialog, eIDOK);
+  ModalDialogButton cancel_button(dialog, eIDCANCEL);
+  GtkWidget* bevel;
+  GtkWidget* ibevel;
+  GtkWidget* endcap;
+  GtkWidget* iendcap;
+  GtkWidget* cylinder;
+  GtkWindow* window = create_modal_dialog_window(MainFrame_getWindow(), "Cap", dialog);
+
+  GtkAccelGroup *accel_group = gtk_accel_group_new();
+  gtk_window_add_accel_group(window, accel_group);
+
+  {
+    GtkHBox* hbox = create_dialog_hbox(4, 4);
+    gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(hbox));
+
+    {
+      // Gef: Added a vbox to contain the toggle buttons
+      GtkVBox* radio_vbox = create_dialog_vbox(4);
+      gtk_container_add(GTK_CONTAINER(hbox), GTK_WIDGET(radio_vbox));
+      
+      {
+        GtkTable* table = GTK_TABLE(gtk_table_new(5, 2, FALSE));
+        gtk_widget_show(GTK_WIDGET(table));
+        gtk_box_pack_start(GTK_BOX(radio_vbox), GTK_WIDGET(table), TRUE, TRUE, 0);
+        gtk_table_set_row_spacings(table, 5);
+        gtk_table_set_col_spacings(table, 5);
+        {
+          GtkImage* image = new_local_image("cap_bevel.bmp");
+          gtk_widget_show(GTK_WIDGET(image));
+          gtk_table_attach(table, GTK_WIDGET(image), 0, 1, 0, 1,
+                            (GtkAttachOptions) (GTK_FILL),
+                            (GtkAttachOptions) (0), 0, 0);
+        }
+        {
+          GtkImage* image = new_local_image("cap_endcap.bmp");
+          gtk_widget_show(GTK_WIDGET(image));
+          gtk_table_attach(table, GTK_WIDGET(image), 0, 1, 1, 2,
+                            (GtkAttachOptions) (GTK_FILL),
+                            (GtkAttachOptions) (0), 0, 0);
+        }
+        {
+          GtkImage* image = new_local_image("cap_ibevel.bmp");
+          gtk_widget_show(GTK_WIDGET(image));
+          gtk_table_attach(table, GTK_WIDGET(image), 0, 1, 2, 3,
+                            (GtkAttachOptions) (GTK_FILL),
+                            (GtkAttachOptions) (0), 0, 0);
+        }
+        {
+          GtkImage* image = new_local_image("cap_iendcap.bmp");
+          gtk_widget_show(GTK_WIDGET(image));
+          gtk_table_attach(table, GTK_WIDGET(image), 0, 1, 3, 4,
+                            (GtkAttachOptions) (GTK_FILL),
+                            (GtkAttachOptions) (0), 0, 0);
+        }
+        {
+          GtkImage* image = new_local_image("cap_cylinder.bmp");
+          gtk_widget_show(GTK_WIDGET(image));
+          gtk_table_attach(table, GTK_WIDGET(image), 0, 1, 4, 5,
+                            (GtkAttachOptions) (GTK_FILL),
+                            (GtkAttachOptions) (0), 0, 0);
+        }
+
+        GSList* group = 0;
+        {
+          GtkWidget* button = gtk_radio_button_new_with_label (group, "Bevel");
+          gtk_widget_show (button);
+          gtk_table_attach(table, button, 1, 2, 0, 1,
+                            (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+                            (GtkAttachOptions) (0), 0, 0);
+          group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+
+          bevel = button;
+        }
+        {
+          GtkWidget* button = gtk_radio_button_new_with_label (group, "Endcap");
+          gtk_widget_show (button);
+          gtk_table_attach(table, button, 1, 2, 1, 2,
+                            (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+                            (GtkAttachOptions) (0), 0, 0);
+          group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+
+          endcap = button;
+        }
+        {
+          GtkWidget* button = gtk_radio_button_new_with_label (group, "Inverted Bevel");
+          gtk_widget_show (button);
+          gtk_table_attach(table, button, 1, 2, 2, 3,
+                            (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+                            (GtkAttachOptions) (0), 0, 0);
+          group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+
+          ibevel = button;
+        }
+        {
+          GtkWidget* button = gtk_radio_button_new_with_label (group, "Inverted Endcap");
+          gtk_widget_show (button);
+          gtk_table_attach(table, button, 1, 2, 3, 4,
+                            (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+                            (GtkAttachOptions) (0), 0, 0);
+          group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+
+          iendcap = button;
+        }
+        {
+          GtkWidget* button = gtk_radio_button_new_with_label (group, "Cylinder");
+          gtk_widget_show (button);
+          gtk_table_attach(table, button, 1, 2, 4, 5,
+                            (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+                            (GtkAttachOptions) (0), 0, 0);
+          group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+
+          cylinder = button;
+        }
+      }
+    }
+    
+    {
+      GtkVBox* vbox = create_dialog_vbox(4);
+      gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(vbox), FALSE, FALSE, 0);
+      {
+        GtkButton* button = create_modal_dialog_button("OK", ok_button);
+        gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(button), FALSE, FALSE, 0);
+        widget_make_default(GTK_WIDGET(button));
+        gtk_widget_add_accelerator(GTK_WIDGET(button), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE);
+      }
+      {
+        GtkButton* button = create_modal_dialog_button("Cancel", cancel_button);
+        gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(button), FALSE, FALSE, 0);
+        gtk_widget_add_accelerator(GTK_WIDGET(button), "clicked", accel_group, GDK_Escape, (GdkModifierType)0, GTK_ACCEL_VISIBLE);
+      }
+    }
+  }
+
+  // Initialize dialog
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bevel), TRUE);
+  
+  EMessageBoxReturn ret = modal_dialog_show(window, dialog);
+  if (ret == eIDOK)
+  {
+    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (bevel)))
+      *type = PATCHCAP_BEVEL;
+    else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(endcap)))
+      *type = PATCHCAP_ENDCAP;
+    else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ibevel)))
+      *type = PATCHCAP_INVERTED_BEVEL;
+    else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(iendcap)))
+      *type = PATCHCAP_INVERTED_ENDCAP;
+    else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder)))
+      *type = PATCHCAP_CYLINDER;
+  }
+
+  gtk_widget_destroy(GTK_WIDGET(window));
+
+  return ret;
+}