ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-26 11:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor refactoring

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@81 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog 2006-06-11 11:28:42 +00:00
parent 6c3931aff8
commit e00838f66e
9 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -39,6 +39,8 @@ At the moment you can only create custom variables by editing the XML file. A cu
This variable could then be used in a command like this: This variable could then be used in a command like this:
<pre>[arghrad] "[MapFile]"</pre> <pre>[arghrad] "[MapFile]"</pre>
Entity: option to filter non-world entities (e.g. not func_group or func_static)
Rotate Tool: if more than one object is selected, with different local orientations, use parent-space rotation pivot instead of local-space
Texture Browser: add a way to make large texture sets more manageable - shaderlist.txt was previously used this way Texture Browser: add a way to make large texture sets more manageable - shaderlist.txt was previously used this way
Brush: MMB+ctrl to paint texture on whole brush/patch. Brush: MMB+ctrl to paint texture on whole brush/patch.
Camera: add alternative highlighting styles (used to be J). Camera: add alternative highlighting styles (used to be J).

10
radiant/brushmanip.cpp
View file

@ -843,16 +843,16 @@ public:
} }
}; };
class filter_face_shader_substring : public FaceFilter class filter_face_shader_prefix : public FaceFilter
{ {
const char* m_shader; const char* m_prefix;
public: public:
filter_face_shader_substring(const char* shader) : m_shader(shader) filter_face_shader_prefix(const char* prefix) : m_prefix(prefix)
{ {
} }
bool filter(const Face& face) const bool filter(const Face& face) const
{ {
return shader_equal_n(face.GetShader(), m_shader, strlen(m_shader)); return shader_equal_n(face.GetShader(), m_prefix, strlen(m_prefix));
} }
}; };
@ -969,7 +969,7 @@ filter_brush_all_faces g_filter_brush_caulk(&g_filter_face_caulk);
filter_face_shader g_filter_face_caulk_ja("textures/system/caulk"); filter_face_shader g_filter_face_caulk_ja("textures/system/caulk");
filter_brush_all_faces g_filter_brush_caulk_ja(&g_filter_face_caulk_ja); filter_brush_all_faces g_filter_brush_caulk_ja(&g_filter_face_caulk_ja);
filter_face_shader_substring g_filter_face_liquids("textures/liquids/"); filter_face_shader_prefix g_filter_face_liquids("textures/liquids/");
filter_brush_any_face g_filter_brush_liquids(&g_filter_face_liquids); filter_brush_any_face g_filter_brush_liquids(&g_filter_face_liquids);
filter_face_shader g_filter_face_hint("textures/common/hint"); filter_face_shader g_filter_face_hint("textures/common/hint");

3
radiant/entityinspector.cpp
View file

@ -1693,7 +1693,8 @@ GtkWidget* EntityInspector_constructWindow(GtkWindow* toplevel)
g_entityInspector_windowConstructed = true; g_entityInspector_windowConstructed = true;
EntityClassList_fill(); EntityClassList_fill();
GlobalSelectionSystem().addSelectionChangeCallback(FreeCaller1<const Selectable&, EntityInspector_selectionChanged>()); typedef FreeCaller1<const Selectable&, EntityInspector_selectionChanged> EntityInspectorSelectionChangedCaller;
GlobalSelectionSystem().addSelectionChangeCallback(EntityInspectorSelectionChangedCaller());
GlobalEntityCreator().setKeyValueChangedFunc(EntityInspector_keyValueChanged); GlobalEntityCreator().setKeyValueChangedFunc(EntityInspector_keyValueChanged);
// hack // hack

3
radiant/entitylist.cpp
View file

@ -419,7 +419,8 @@ void EntityList_Construct()
GlobalPreferenceSystem().registerPreference("EntityInfoDlg", WindowPositionTrackerImportStringCaller(getEntityList().m_positionTracker), WindowPositionTrackerExportStringCaller(getEntityList().m_positionTracker)); GlobalPreferenceSystem().registerPreference("EntityInfoDlg", WindowPositionTrackerImportStringCaller(getEntityList().m_positionTracker), WindowPositionTrackerExportStringCaller(getEntityList().m_positionTracker));
GlobalSelectionSystem().addSelectionChangeCallback(FreeCaller1<const Selectable&, EntityList_SelectionChanged>()); typedef FreeCaller1<const Selectable&, EntityList_SelectionChanged> EntityListSelectionChangedCaller;
GlobalSelectionSystem().addSelectionChangeCallback(EntityListSelectionChangedCaller());
} }
void EntityList_Destroy() void EntityList_Destroy()
{ {

3
radiant/mainframe.cpp
View file

@ -3452,7 +3452,8 @@ void MainFrame_Construct()
Patch_registerCommands(); Patch_registerCommands();
XYShow_registerCommands(); XYShow_registerCommands();
GlobalSelectionSystem().addSelectionChangeCallback(FreeCaller1<const Selectable&, ComponentMode_SelectionChanged>()); typedef FreeCaller1<const Selectable&, ComponentMode_SelectionChanged> ComponentModeSelectionChangedCaller;
GlobalSelectionSystem().addSelectionChangeCallback(ComponentModeSelectionChangedCaller());
GlobalPreferenceSystem().registerPreference("DetachableMenus", BoolImportStringCaller(g_Layout_enableDetachableMenus.m_latched), BoolExportStringCaller(g_Layout_enableDetachableMenus.m_latched)); GlobalPreferenceSystem().registerPreference("DetachableMenus", BoolImportStringCaller(g_Layout_enableDetachableMenus.m_latched), BoolExportStringCaller(g_Layout_enableDetachableMenus.m_latched));
GlobalPreferenceSystem().registerPreference("PatchToolBar", BoolImportStringCaller(g_Layout_enablePatchToolbar.m_latched), BoolExportStringCaller(g_Layout_enablePatchToolbar.m_latched)); GlobalPreferenceSystem().registerPreference("PatchToolBar", BoolImportStringCaller(g_Layout_enablePatchToolbar.m_latched), BoolExportStringCaller(g_Layout_enablePatchToolbar.m_latched));

6
radiant/patchdialog.cpp
View file

@ -1208,8 +1208,10 @@ void PatchInspector_Construct()
GlobalPreferenceSystem().registerPreference("SI_PatchTexdef_Shift2", FloatImportStringCaller(g_pi_globals.shift[1]), FloatExportStringCaller(g_pi_globals.shift[1])); GlobalPreferenceSystem().registerPreference("SI_PatchTexdef_Shift2", FloatImportStringCaller(g_pi_globals.shift[1]), FloatExportStringCaller(g_pi_globals.shift[1]));
GlobalPreferenceSystem().registerPreference("SI_PatchTexdef_Rotate", FloatImportStringCaller(g_pi_globals.rotate), FloatExportStringCaller(g_pi_globals.rotate)); GlobalPreferenceSystem().registerPreference("SI_PatchTexdef_Rotate", FloatImportStringCaller(g_pi_globals.rotate), FloatExportStringCaller(g_pi_globals.rotate));
GlobalSelectionSystem().addSelectionChangeCallback(FreeCaller1<const Selectable&, PatchInspector_SelectionChanged>()); typedef FreeCaller1<const Selectable&, PatchInspector_SelectionChanged> PatchInspectorSelectionChangedCaller;
Patch_addTextureChangedCallback(FreeCaller<PatchInspector_queueDraw>()); GlobalSelectionSystem().addSelectionChangeCallback(PatchInspectorSelectionChangedCaller());
typedef FreeCaller<PatchInspector_queueDraw> PatchInspectorQueueDrawCaller;
Patch_addTextureChangedCallback(PatchInspectorQueueDrawCaller());
} }
void PatchInspector_Destroy() void PatchInspector_Destroy()
{ {

11
radiant/select.cpp
View file

@ -228,7 +228,7 @@ void UpdateWorkzone_ForSelection()
} }
// update the workzone to the current selection // update the workzone to the current selection
void UpdateWorkzone_ForSelection(const Selectable& selectable) void UpdateWorkzone_ForSelectionChanged(const Selectable& selectable)
{ {
if(selectable.isSelected()) if(selectable.isSelected())
{ {
@ -735,9 +735,12 @@ SignalHandlerId Selection_boundsChanged;
void Selection_construct() void Selection_construct()
{ {
GlobalSelectionSystem().addSelectionChangeCallback(FreeCaller1<const Selectable&, SceneSelectionChange>()); typedef FreeCaller1<const Selectable&, SceneSelectionChange> SceneSelectionChangeCaller;
GlobalSelectionSystem().addSelectionChangeCallback(FreeCaller1<const Selectable&, UpdateWorkzone_ForSelection>()); GlobalSelectionSystem().addSelectionChangeCallback(SceneSelectionChangeCaller());
Selection_boundsChanged = GlobalSceneGraph().addBoundsChangedCallback(FreeCaller<UpdateWorkzone_ForSelection>()); typedef FreeCaller1<const Selectable&, UpdateWorkzone_ForSelectionChanged> UpdateWorkzoneForSelectionChangedCaller;
GlobalSelectionSystem().addSelectionChangeCallback(UpdateWorkzoneForSelectionChangedCaller());
typedef FreeCaller<UpdateWorkzone_ForSelection> UpdateWorkzoneForSelectionCaller;
Selection_boundsChanged = GlobalSceneGraph().addBoundsChangedCallback(UpdateWorkzoneForSelectionCaller());
} }
void Selection_destroy() void Selection_destroy()

4
radiant/selection.cpp
View file

@ -2833,7 +2833,7 @@ public:
{ {
SetManipulatorMode(eTranslate); SetManipulatorMode(eTranslate);
pivotChanged(); pivotChanged();
addSelectionChangeCallback(pivotChangedSelectionCaller(*this)); addSelectionChangeCallback(PivotChangedSelectionCaller(*this));
AddGridChangeCallback(PivotChangedCaller(*this)); AddGridChangeCallback(PivotChangedCaller(*this));
} }
void pivotChanged() const void pivotChanged() const
@ -2846,7 +2846,7 @@ public:
{ {
pivotChanged(); pivotChanged();
} }
typedef MemberCaller1<RadiantSelectionSystem, const Selectable&, &RadiantSelectionSystem::pivotChangedSelection> pivotChangedSelectionCaller; typedef MemberCaller1<RadiantSelectionSystem, const Selectable&, &RadiantSelectionSystem::pivotChangedSelection> PivotChangedSelectionCaller;
void SetMode(EMode mode) void SetMode(EMode mode)
{ {

8
radiant/surfacedialog.cpp
View file

@ -1594,9 +1594,11 @@ void SurfaceInspector_Construct()
GlobalPreferenceSystem().registerPreference("SI_SurfaceTexdef_Rotate", FloatImportStringCaller(g_si_globals.rotate), FloatExportStringCaller(g_si_globals.rotate)); GlobalPreferenceSystem().registerPreference("SI_SurfaceTexdef_Rotate", FloatImportStringCaller(g_si_globals.rotate), FloatExportStringCaller(g_si_globals.rotate));
GlobalPreferenceSystem().registerPreference("SnapTToGrid", BoolImportStringCaller(g_si_globals.m_bSnapTToGrid), BoolExportStringCaller(g_si_globals.m_bSnapTToGrid)); GlobalPreferenceSystem().registerPreference("SnapTToGrid", BoolImportStringCaller(g_si_globals.m_bSnapTToGrid), BoolExportStringCaller(g_si_globals.m_bSnapTToGrid));
GlobalSelectionSystem().addSelectionChangeCallback(FreeCaller1<const Selectable&, SurfaceInspector_SelectionChanged>()); typedef FreeCaller1<const Selectable&, SurfaceInspector_SelectionChanged> SurfaceInspectorSelectionChangedCaller;
Brush_addTextureChangedCallback(FreeCaller<SurfaceInspector_updateSelection>()); GlobalSelectionSystem().addSelectionChangeCallback(SurfaceInspectorSelectionChangedCaller());
Patch_addTextureChangedCallback(FreeCaller<SurfaceInspector_updateSelection>()); typedef FreeCaller<SurfaceInspector_updateSelection> SurfaceInspectorUpdateSelectionCaller;
Brush_addTextureChangedCallback(SurfaceInspectorUpdateSelectionCaller());
Patch_addTextureChangedCallback(SurfaceInspectorUpdateSelectionCaller());
SurfaceInspector_registerPreferencesPage(); SurfaceInspector_registerPreferencesPage();
} }