quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable the previously disabled "Sphere" patch primitive

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@390 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-07-24 23:18:20 +00:00
parent e23ea7ea7d
commit a2eceb0f18
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
radiant/patch.cpp
View File

@ -1336,7 +1336,7 @@ void Patch::ConstructPrefab(const AABB& aabb, EPatchPrefab eType, int axis, std:
{ {
pCtrl->m_vertex[0] = vPos[1][0]; pCtrl->m_vertex[0] = vPos[1][0];
pCtrl->m_vertex[1] = vPos[1][1]; pCtrl->m_vertex[1] = vPos[1][1];
pCtrl->m_vertex[2] = vPos[2][2]; pCtrl->m_vertex[2] = vPos[0][2];
} }
} }
{ {
@ -1348,6 +1348,7 @@ void Patch::ConstructPrefab(const AABB& aabb, EPatchPrefab eType, int axis, std:
pCtrl->m_vertex[2] = vPos[2][2]; pCtrl->m_vertex[2] = vPos[2][2];
} }
} }
break;
default: default:
ERROR_MESSAGE("this should be unreachable"); ERROR_MESSAGE("this should be unreachable");
return; return;

9
radiant/patchmanip.cpp
View File

@ -474,6 +474,13 @@ void Patch_Bevel()
Scene_PatchConstructPrefab(GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader(GlobalTextureBrowser()), eBevel, GlobalXYWnd_getCurrentViewType()); 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_SquareBevel()
{ {
} }
@ -744,6 +751,7 @@ void Patch_registerCommands()
GlobalCommands_insert("PatchSquareBevel", FreeCaller<Patch_SquareBevel>()); GlobalCommands_insert("PatchSquareBevel", FreeCaller<Patch_SquareBevel>());
GlobalCommands_insert("PatchSquareEndcap", FreeCaller<Patch_SquareEndcap>()); GlobalCommands_insert("PatchSquareEndcap", FreeCaller<Patch_SquareEndcap>());
GlobalCommands_insert("PatchCone", FreeCaller<Patch_Cone>()); 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("SimplePatchMesh", FreeCaller<Patch_Plane>(), Accelerator('P', (GdkModifierType)GDK_SHIFT_MASK));
GlobalCommands_insert("PatchInsertInsertColumn", FreeCaller<Patch_InsertInsertColumn>()); GlobalCommands_insert("PatchInsertInsertColumn", FreeCaller<Patch_InsertInsertColumn>());
GlobalCommands_insert("PatchInsertAddColumn", FreeCaller<Patch_InsertAddColumn>()); GlobalCommands_insert("PatchInsertAddColumn", FreeCaller<Patch_InsertAddColumn>());
@ -793,6 +801,7 @@ void Patch_constructMenu(GtkMenu* menu)
} }
menu_separator (menu); menu_separator (menu);
create_menu_item_with_mnemonic(menu, "Cone", "PatchCone"); create_menu_item_with_mnemonic(menu, "Cone", "PatchCone");
create_menu_item_with_mnemonic(menu, "Sphere", "PatchSphere");
menu_separator (menu); menu_separator (menu);
create_menu_item_with_mnemonic(menu, "Simple Patch Mesh...", "SimplePatchMesh"); create_menu_item_with_mnemonic(menu, "Simple Patch Mesh...", "SimplePatchMesh");
menu_separator (menu); menu_separator (menu);