X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=radiant%2Fselect.cpp;h=7a40bb35eeab2035df480d91d5de2f9454ae423b;hb=cd6613e5171544b68d4ae70546c90a15c99b22a5;hp=de8ea82e050db49a139c07081d9887194c73681c;hpb=830125fad042fad35dc029b6eb57c8156ad7e176;p=xonotic%2Fnetradiant.git diff --git a/radiant/select.cpp b/radiant/select.cpp index de8ea82e..7a40bb35 100644 --- a/radiant/select.cpp +++ b/radiant/select.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2007 id Software, Inc. and contributors. + 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. @@ -19,2063 +19,1110 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -// select.c -#include "stdafx.h" -#include -#include "filters.h" +#include "select.h" -// externs -CPtrArray g_SelectedFaces; -CPtrArray g_SelectedFaceBrushes; -CPtrArray& g_ptrSelectedFaces = g_SelectedFaces; -CPtrArray& g_ptrSelectedFaceBrushes = g_SelectedFaceBrushes; +#include -/* - =========== - Test_Ray - =========== - */ -#define DIST_START 999999 -trace_t Test_Ray( vec3_t origin, vec3_t dir, int flags ){ - brush_t *brush; - face_t *face; - float dist; - trace_t t; - - memset( &t, 0, sizeof( t ) ); - t.dist = DIST_START; - - if ( flags & SF_CYCLE ) { - CPtrArray array; - brush_t *pToSelect = ( selected_brushes.next != &selected_brushes ) ? selected_brushes.next : NULL; - Select_Deselect(); - - // go through active brushes and accumulate all "hit" brushes - for ( brush = active_brushes.next ; brush != &active_brushes ; brush = brush->next ) - { - //if ( (flags & SF_ENTITIES_FIRST) && brush->owner == world_entity) - // continue; - - if ( brush->bFiltered ) { - continue; - } - - if ( !g_PrefsDlg.m_bSelectCurves && brush->patchBrush ) { - continue; - } +#include "debugging/debugging.h" - if ( !g_PrefsDlg.m_bSelectModels && ( brush->owner->eclass->nShowFlags & ECLASS_MISCMODEL ) ) { - continue; - } +#include "ientity.h" +#include "iselection.h" +#include "iundo.h" - //if (!g_bShowPatchBounds && brush->patchBrush) - // continue; +#include - face = Brush_Ray( origin, dir, brush, &dist, flags ); +#include "stream/stringstream.h" +#include "signal/isignal.h" +#include "shaderlib.h" +#include "scenelib.h" - if ( face ) { - array.Add( brush ); - } - } +#include "gtkutil/idledraw.h" +#include "gtkutil/dialog.h" +#include "gtkutil/widget.h" +#include "brushmanip.h" +#include "brush.h" +#include "patchmanip.h" +#include "patchdialog.h" +#include "selection.h" +#include "texwindow.h" +#include "gtkmisc.h" +#include "mainframe.h" +#include "grid.h" +#include "map.h" +#include "entityinspector.h" - int nSize = array.GetSize(); - if ( nSize > 0 ) { - bool bFound = false; - for ( int i = 0; i < nSize; i++ ) - { - brush_t *b = reinterpret_cast( array.GetAt( i ) ); - // did we hit the last one selected yet ? - if ( b == pToSelect ) { - // yes we want to select the next one in the list - int n = ( i > 0 ) ? i - 1 : nSize - 1; - pToSelect = reinterpret_cast( array.GetAt( n ) ); - bFound = true; - break; - } - } - if ( !bFound ) { - pToSelect = reinterpret_cast( array.GetAt( 0 ) ); - } - } - if ( pToSelect ) { - face = Brush_Ray( origin, dir, pToSelect, &dist, flags ); - t.dist = dist; - t.brush = pToSelect; - t.face = face; - t.selected = false; - return t; - } - } - if ( !( flags & SF_SELECTED_ONLY ) ) { - for ( brush = active_brushes.next ; brush != &active_brushes ; brush = brush->next ) - { - if ( ( flags & SF_ENTITIES_FIRST ) && ( brush->owner == world_entity || !brush->owner->eclass->fixedsize ) ) { - continue; - } - if ( brush->bFiltered ) { - continue; - } +select_workzone_t g_select_workzone; - if ( !g_PrefsDlg.m_bSelectCurves && brush->patchBrush ) { - continue; - } - if ( !g_PrefsDlg.m_bSelectModels && ( brush->owner->eclass->nShowFlags & ECLASS_MISCMODEL ) ) { - continue; - } +/** + Loops over all selected brushes and stores their + world AABBs in the specified array. + */ +class CollectSelectedBrushesBounds : public SelectionSystem::Visitor +{ +AABB* m_bounds; // array of AABBs +Unsigned m_max; // max AABB-elements in array +Unsigned& m_count; // count of valid AABBs stored in array + +public: +CollectSelectedBrushesBounds( AABB* bounds, Unsigned max, Unsigned& count ) + : m_bounds( bounds ), + m_max( max ), + m_count( count ){ + m_count = 0; +} - //if (!g_bShowPatchBounds && brush->patchBrush) - // continue; +void visit( scene::Instance& instance ) const { + ASSERT_MESSAGE( m_count <= m_max, "Invalid m_count in CollectSelectedBrushesBounds" ); - face = Brush_Ray( origin, dir, brush, &dist, flags ); - if ( face && dist > 0 && dist < t.dist ) { - t.dist = dist; - t.brush = brush; - t.face = face; - t.selected = false; - } - } + // stop if the array is already full + if ( m_count == m_max ) { + return; } - - for ( brush = selected_brushes.next ; brush != &selected_brushes ; brush = brush->next ) - { - if ( ( flags & SF_ENTITIES_FIRST ) && ( brush->owner == world_entity || !brush->owner->eclass->fixedsize ) ) { - continue; - } - - if ( brush->bFiltered ) { - continue; + Selectable* selectable = Instance_getSelectable( instance ); + if ( ( selectable != 0 ) + && instance.isSelected() ) { + // brushes only + if ( Instance_getBrush( instance ) != 0 ) { + m_bounds[m_count] = instance.worldAABB(); + ++m_count; } + } +} +}; - if ( !g_PrefsDlg.m_bSelectCurves && brush->patchBrush ) { - continue; - } +/** + Selects all objects that intersect one of the bounding AABBs. + The exact intersection-method is specified through TSelectionPolicy + */ +template +class SelectByBounds : public scene::Graph::Walker +{ +AABB* m_aabbs; // selection aabbs +Unsigned m_count; // number of aabbs in m_aabbs +TSelectionPolicy policy; // type that contains a custom intersection method aabb<->aabb + +public: +SelectByBounds( AABB* aabbs, Unsigned count ) + : m_aabbs( aabbs ), + m_count( count ){ +} - if ( !g_PrefsDlg.m_bSelectModels && ( brush->owner->eclass->nShowFlags & ECLASS_MISCMODEL ) ) { - continue; - } +bool pre( const scene::Path& path, scene::Instance& instance ) const { + Selectable* selectable = Instance_getSelectable( instance ); - face = Brush_Ray( origin, dir, brush, &dist, flags ); - if ( dist > 0 && dist < t.dist ) { - t.dist = dist; - t.brush = brush; - t.face = face; - t.selected = true; + // ignore worldspawn + Entity* entity = Node_getEntity( path.top() ); + if ( entity ) { + if ( string_equal( entity->getKeyValue( "classname" ), "worldspawn" ) ) { + return true; } } - // if entites first, but didn't find any, check regular - - if ( ( flags & SF_ENTITIES_FIRST ) && t.brush == NULL ) { - return Test_Ray( origin, dir, flags & ~SF_ENTITIES_FIRST ); + if ( ( path.size() > 1 ) && + ( !path.top().get().isRoot() ) && + ( selectable != 0 ) + ) { + for ( Unsigned i = 0; i < m_count; ++i ) + { + if ( policy.Evaluate( m_aabbs[i], instance ) ) { + selectable->setSelected( true ); + } + } } - return t; - + return true; } - -/* - ============ - Select_Brush - - ============ +/** + Performs selection operation on the global scenegraph. + If delete_bounds_src is true, then the objects which were + used as source for the selection aabbs will be deleted. */ -void Select_Brush( brush_t *brush, bool bComplete, bool bStatus ){ - brush_t *b; - entity_t *e; - - g_ptrSelectedFaces.RemoveAll(); - g_ptrSelectedFaceBrushes.RemoveAll(); - if ( g_qeglobals.d_select_count < 2 ) { - g_qeglobals.d_select_order[g_qeglobals.d_select_count] = brush; - } - g_qeglobals.d_select_count++; - - e = brush->owner; - if ( e ) { - // select complete entity on first click - if ( e != world_entity && bComplete == true ) { - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - if ( b->owner == e ) { - goto singleselect; - } - for ( b = e->brushes.onext ; b != &e->brushes ; b = b->onext ) - { - if ( b == brush ) { // make sure we add the actual selected brush last, mainly for cycle select - continue; - } - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); - } - Brush_RemoveFromList( brush ); - Brush_AddToList( brush, &selected_brushes ); - } - else - { -singleselect: - Brush_RemoveFromList( brush ); - Brush_AddToList( brush, &selected_brushes ); - UpdatePatchInspector(); +static void DoSelection( bool delete_bounds_src = true ){ + if ( GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive ) { + // we may not need all AABBs since not all selected objects have to be brushes + const Unsigned max = (Unsigned)GlobalSelectionSystem().countSelected(); + AABB* aabbs = new AABB[max]; + + Unsigned count; + CollectSelectedBrushesBounds collector( aabbs, max, count ); + GlobalSelectionSystem().foreachSelected( collector ); + + // nothing usable in selection + if ( !count ) { + delete[] aabbs; + return; } - if ( e->eclass ) { - UpdateEntitySel( brush->owner->eclass ); + // delete selected objects + if ( delete_bounds_src ) { // see deleteSelection + UndoableCommand undo( "deleteSelected" ); + Select_Delete(); } - UpdateSurfaceDialog(); - } + // select objects with bounds + GlobalSceneGraph().traverse( SelectByBounds( aabbs, count ) ); - if ( bStatus ) { - vec3_t vMin, vMax, vSize; - Select_GetBounds( vMin, vMax ); - VectorSubtract( vMax, vMin, vSize ); - CString strStatus; - strStatus.Format( "Selection X:: %.1f Y:: %.1f Z:: %.1f", vSize[0], vSize[1], vSize[2] ); - g_pParentWnd->SetStatusText( 2, strStatus ); + SceneChangeNotify(); + delete[] aabbs; } } +}; -/* - ============= - Select_FaceInSelectedBrushes - ============= +/** + SelectionPolicy for SelectByBounds + Returns true if box and the AABB of instance intersect */ -bool Select_FaceInSelectedBrushes( face_t *face ){ - brush_t *brush; - face_t *tface; - - for ( brush = selected_brushes.next; brush != &selected_brushes; brush = brush->next ) +class SelectionPolicy_Touching +{ +public: +bool Evaluate( const AABB& box, scene::Instance& instance ) const { + const AABB& other( instance.worldAABB() ); + for ( Unsigned i = 0; i < 3; ++i ) { - for ( tface = brush->brush_faces; tface; tface = tface->next ) - { - if ( tface == face ) { - return true; - } + if ( fabsf( box.origin[i] - other.origin[i] ) > ( box.extents[i] + other.extents[i] ) ) { + return false; } } - - return false; + return true; } +}; -/* - ============ - Select_Ray - - If the origin is inside a brush, that brush will be ignored. - ============ +/** + SelectionPolicy for SelectByBounds + Returns true if the AABB of instance is inside box */ -void Select_Ray( vec3_t origin, vec3_t dir, int flags ){ - trace_t t; - face_t *tface; - bool bOk; - static trace_t lastTrace = { - NULL, // brush - NULL, // face - 0, // dist - false // selected - }; - - t = Test_Ray( origin, dir, flags ); - if ( !t.brush ) { - return; - } - - if ( flags & SF_SINGLEFACE ) { - if ( flags & SF_DRAG ) { - if ( t.brush == lastTrace.brush && t.face == lastTrace.face ) { - return; - } +class SelectionPolicy_Inside +{ +public: +bool Evaluate( const AABB& box, scene::Instance& instance ) const { + const AABB& other( instance.worldAABB() ); + for ( Unsigned i = 0; i < 3; ++i ) + { + if ( fabsf( box.origin[i] - other.origin[i] ) > ( box.extents[i] - other.extents[i] ) ) { + return false; } - lastTrace = t; + } + return true; +} +}; - if ( Select_FaceInSelectedBrushes( t.face ) ) { - // Deselect the brush - Brush_RemoveFromList( t.brush ); - Brush_AddToList( t.brush, &active_brushes ); - UpdatePatchInspector(); +class DeleteSelected : public scene::Graph::Walker +{ +mutable bool m_remove; +mutable bool m_removedChild; +public: +DeleteSelected() + : m_remove( false ), m_removedChild( false ){ +} +bool pre( const scene::Path& path, scene::Instance& instance ) const { + m_removedChild = false; - // Select all of the brush's faces except the one we are pointing at - for ( tface = t.brush->brush_faces; tface; tface = tface->next ) - { - if ( tface == t.face ) { - continue; - } + Selectable* selectable = Instance_getSelectable( instance ); + if ( selectable != 0 + && selectable->isSelected() + && path.size() > 1 + && !path.top().get().isRoot() ) { + m_remove = true; - bOk = true; - // NOTE: keep the size check in the loop, we remove stuff inside - for ( int i = 0; i < g_SelectedFaces.GetSize(); i++ ) - { - if ( tface == reinterpret_cast( g_SelectedFaces.GetAt( i ) ) ) { - bOk = false; - } - } + return false; // dont traverse into child elements + } + return true; +} +void post( const scene::Path& path, scene::Instance& instance ) const { - if ( bOk ) { - g_SelectedFaces.Add( tface ); - g_SelectedFaceBrushes.Add( t.brush ); - } - } - g_qeglobals.d_select_mode = sel_facets_off; - } - else - { - bOk = true; - // NOTE: keep the size check in the loop, we remove stuff inside - for ( int i = 0; i < g_SelectedFaces.GetSize(); i++ ) - { - if ( t.face == reinterpret_cast( g_SelectedFaces.GetAt( i ) ) ) { - bOk = false; - if ( flags & SF_DRAG_ON ) { - continue; - } - - g_qeglobals.d_select_mode = sel_facets_off; - // need to remove i'th entry - g_SelectedFaces.RemoveAt( i, 1 ); - g_SelectedFaceBrushes.RemoveAt( i, 1 ); - } - } + if ( m_removedChild ) { + m_removedChild = false; - if ( bOk && !( flags & SF_DRAG_OFF ) ) { - g_SelectedFaces.Add( t.face ); - g_SelectedFaceBrushes.Add( t.brush ); - g_qeglobals.d_select_mode = sel_facets_on; - } + // delete empty entities + Entity* entity = Node_getEntity( path.top() ); + if ( entity != 0 + && path.top().get_pointer() != Map_FindWorldspawn( g_map ) + && Node_getTraversable( path.top() )->empty() ) { + Path_deleteTop( path ); } - UpdateSurfaceDialog(); - Sys_UpdateWindows( W_ALL ); - //g_qeglobals.d_select_mode = sel_brush; - // Texture_SetTexture requires a brushprimit_texdef fitted to the default width=2 height=2 texture - brushprimit_texdef_t brushprimit_texdef; - ConvertTexMatWithQTexture( &t.face->brushprimit_texdef, t.face->d_texture, &brushprimit_texdef, NULL ); - Texture_SetTexture( &t.face->texdef, &brushprimit_texdef, false, NULL, false ); - return; } - // move the brush to the other list - if ( t.selected ) { - if ( flags & SF_DRAG_ON ) { - return; - } - - g_qeglobals.d_select_mode = sel_brush_off; - Brush_RemoveFromList( t.brush ); - Brush_AddToList( t.brush, &active_brushes ); - - UpdatePatchInspector(); - } - else - { - if ( flags & SF_DRAG_OFF ) { - return; + // node should be removed + if ( m_remove ) { + if ( Node_isEntity( path.parent() ) != 0 ) { + m_removedChild = true; } - g_qeglobals.d_select_mode = sel_brush_on; - Select_Brush( t.brush, g_PrefsDlg.m_nCamDragMultiSelect == 1 ? Sys_AltDown() : !Sys_AltDown() ); + m_remove = false; + Path_deleteTop( path ); } - UpdateSurfaceDialog(); - Sys_UpdateWindows( W_ALL ); } +}; +void Scene_DeleteSelected( scene::Graph& graph ){ + graph.traverse( DeleteSelected() ); + SceneChangeNotify(); +} void Select_Delete( void ){ - brush_t *brush; - entity_t *e; - - g_ptrSelectedFaces.RemoveAll(); - g_ptrSelectedFaceBrushes.RemoveAll(); - - g_qeglobals.d_select_mode = sel_brush; + Scene_DeleteSelected( GlobalSceneGraph() ); +} - g_qeglobals.d_select_count = 0; - g_qeglobals.d_num_move_points = 0; - while ( selected_brushes.next != &selected_brushes ) - { - brush = selected_brushes.next; - if ( brush->patchBrush ) { - Patch_Delete( brush->pPatch ); - } - e = brush->owner; - Brush_Free( brush ); - // remove if no brushes - if ( e != world_entity && e->brushes.onext == &e->brushes ) { - Entity_Free( e ); +class InvertSelectionWalker : public scene::Graph::Walker +{ +SelectionSystem::EMode m_mode; +mutable Selectable* m_selectable; +public: +InvertSelectionWalker( SelectionSystem::EMode mode ) + : m_mode( mode ), m_selectable( 0 ){ +} +bool pre( const scene::Path& path, scene::Instance& instance ) const { + Selectable* selectable = Instance_getSelectable( instance ); + if ( selectable ) { + switch ( m_mode ) + { + case SelectionSystem::eEntity: + if ( Node_isEntity( path.top() ) != 0 ) { + m_selectable = path.top().get().visible() ? selectable : 0; + } + break; + case SelectionSystem::ePrimitive: + m_selectable = path.top().get().visible() ? selectable : 0; + break; + case SelectionSystem::eComponent: + break; } } - - Sys_MarkMapModified(); - UpdateSurfaceDialog(); - Sys_UpdateWindows( W_ALL ); + return true; } - -// update the workzone to a given brush -void UpdateWorkzone_ForBrush( brush_t* b ){ - VectorCopy( b->mins, g_qeglobals.d_work_min ); - VectorCopy( b->maxs, g_qeglobals.d_work_max ); - //++timo clean -#if 0 - // will update the workzone to the given brush - // g_pParentWnd->ActiveXY()->GetViewType() - // cf VIEWTYPE defintion: enum VIEWTYPE {YZ, XZ, XY}; - // we fit our work zone to the last brush on the list (b) - int nViewType = g_pParentWnd->ActiveXY()->GetViewType(); - int nDim1 = ( nViewType == YZ ) ? 1 : 0; - int nDim2 = ( nViewType == XY ) ? 1 : 2; - g_qeglobals.d_work_min[nDim1] = b->mins[nDim1]; - g_qeglobals.d_work_max[nDim1] = b->maxs[nDim1]; - g_qeglobals.d_work_min[nDim2] = b->mins[nDim2]; - g_qeglobals.d_work_max[nDim2] = b->maxs[nDim2]; -#endif +void post( const scene::Path& path, scene::Instance& instance ) const { + if ( m_selectable != 0 ) { + m_selectable->setSelected( !m_selectable->isSelected() ); + m_selectable = 0; + } } +}; -// here to filter new brushes once unselected -extern void PerformFiltering(); - -void Select_Deselect( bool bDeselectFaces ){ - brush_t *b; +void Scene_Invert_Selection( scene::Graph& graph ){ + graph.traverse( InvertSelectionWalker( GlobalSelectionSystem().Mode() ) ); +} - Patch_Deselect(); +void Select_Invert(){ + Scene_Invert_Selection( GlobalSceneGraph() ); +} - g_pParentWnd->ActiveXY()->UndoClear(); +class ExpandSelectionToEntitiesWalker : public scene::Graph::Walker +{ +mutable std::size_t m_depth; +NodeSmartReference worldspawn; +public: +ExpandSelectionToEntitiesWalker() : m_depth( 0 ), worldspawn( Map_FindOrInsertWorldspawn( g_map ) ){ +} +bool pre( const scene::Path& path, scene::Instance& instance ) const { + ++m_depth; - g_qeglobals.d_workcount++; - g_qeglobals.d_select_count = 0; - g_qeglobals.d_num_move_points = 0; - b = selected_brushes.next; + // ignore worldspawn + NodeSmartReference me( path.top().get() ); + if ( me == worldspawn ) { + return false; + } - if ( b == &selected_brushes ) { - if ( bDeselectFaces ) { - g_ptrSelectedFaces.RemoveAll(); - g_ptrSelectedFaceBrushes.RemoveAll(); + if ( m_depth == 2 ) { // entity depth + // traverse and select children if any one is selected + if ( instance.childSelected() ) { + Instance_setSelected( instance, true ); } - PerformFiltering(); - UpdateSurfaceDialog(); - Sys_UpdateWindows( W_ALL ); - return; + return Node_getEntity( path.top() )->isContainer() && instance.isSelected(); } - - if ( bDeselectFaces ) { - g_ptrSelectedFaces.RemoveAll(); - g_ptrSelectedFaceBrushes.RemoveAll(); + else if ( m_depth == 3 ) { // primitive depth + Instance_setSelected( instance, true ); + return false; } + return true; +} +void post( const scene::Path& path, scene::Instance& instance ) const { + --m_depth; +} +}; - g_qeglobals.d_select_mode = sel_brush; - - UpdateWorkzone_ForBrush( b ); +void Scene_ExpandSelectionToEntities(){ + GlobalSceneGraph().traverse( ExpandSelectionToEntitiesWalker() ); +} - selected_brushes.next->prev = &active_brushes; - selected_brushes.prev->next = active_brushes.next; - active_brushes.next->prev = selected_brushes.prev; - active_brushes.next = selected_brushes.next; - selected_brushes.prev = selected_brushes.next = &selected_brushes; - // filter newly created stuff once it's unselected - PerformFiltering(); - UpdateSurfaceDialog(); - Sys_UpdateWindows( W_ALL ); +namespace +{ +void Selection_UpdateWorkzone(){ + if ( GlobalSelectionSystem().countSelected() != 0 ) { + Select_GetBounds( g_select_workzone.d_work_min, g_select_workzone.d_work_max ); + } } +typedef FreeCaller SelectionUpdateWorkzoneCaller; -/* - ============ - Select_Move - ============ - */ -/*! Moves the currently selected brush/patch - \param delta How far to move the selection (x,y,z) - \param bSnap If the move should snap to grid points - */ -void Select_Move( vec3_t delta, bool bSnap ){ - brush_t *b; - - // actually move the selected brushes - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - Brush_Move( b, delta, bSnap ); +IdleDraw g_idleWorkzone = IdleDraw( SelectionUpdateWorkzoneCaller() ); +} - vec3_t vMin, vMax; - Select_GetBounds( vMin, vMax ); - CString strStatus; - strStatus.Format( "Origin X:: %.1f Y:: %.1f Z:: %.1f", vMin[0], vMax[1], vMax[2] ); - g_pParentWnd->SetStatusText( 2, strStatus ); +const select_workzone_t& Select_getWorkZone(){ + g_idleWorkzone.flush(); + return g_select_workzone; +} - //Sys_UpdateWindows (W_ALL); +void UpdateWorkzone_ForSelection(){ + g_idleWorkzone.queueDraw(); } -/* - ================= - Select_NudgeVerts - ================= - */ -/*! Moves the currently selected brush/patch vertices - \param delta How far to move the vertices (x,y,z) - \param bSnap If the move should snap to grid points - */ -void Select_NudgePoint( vec3_t delta, qboolean bSnap ){ - if ( g_qeglobals.d_select_mode == sel_vertex ) { - // move selected verts - brush_t *b; - vec3_t end; - qboolean success = true; - for ( b = selected_brushes.next; b != &selected_brushes; b = b->next ) - { - success &= (qboolean)Brush_MoveVertex( b, g_qeglobals.d_move_points[0], delta, end, bSnap ); - } - if ( success ) { - VectorCopy( end, g_qeglobals.d_move_points[0] ); - } - } - else if ( g_qeglobals.d_select_mode == sel_curvepoint ) { - // move selected patch control points - Patch_UpdateSelected( delta ); +// update the workzone to the current selection +void UpdateWorkzone_ForSelectionChanged( const Selectable& selectable ){ + if ( selectable.isSelected() ) { + UpdateWorkzone_ForSelection(); } } -/* - ============ - Select_Clone - - Creates an exact duplicate of the selection in place, then moves - the selected brushes off of their old positions - ============ - */ -void Select_Clone( void ){ - g_bScreenUpdates = false; - g_pParentWnd->Copy(); - Select_Deselect(); - g_pParentWnd->Paste(); - g_pParentWnd->NudgeSelection( 2, g_qeglobals.d_gridsize ); - g_pParentWnd->NudgeSelection( 3, g_qeglobals.d_gridsize ); - Undo_Start( "clone" ); - Undo_EndBrushList( &selected_brushes ); - Undo_End(); - g_bScreenUpdates = true; - Sys_UpdateWindows( W_ALL ); -} - -//++timo clean -#if 0 -/* - ============ - Select_SetTexture - Timo : bFitScale to compute scale on the plane and counteract plane / axial plane snapping - Timo : brush primitive texturing - the brushprimit_texdef given must be understood as a qtexture_t width=2 height=2 ( HiRes ) - Timo : texture plugin, added an IPluginTexdef* parameter - must be casted to an IPluginTexdef! - if not NULL, get ->Copy() of it into each face or brush ( and remember to hook ) - if NULL, means we have no information, ask for a default - TTimo - shader code cleanup - added IShader* parameter - ============ - */ -void WINAPI Select_SetTexture2( IShader* pShader, texdef_t *texdef, brushprimit_texdef_t *brushprimit_texdef, bool bFitScale, void* pPlugTexdef ){ - brush_t *b; - int nCount = g_ptrSelectedFaces.GetSize(); - if ( nCount > 0 ) { - Undo_Start( "set face textures" ); - ASSERT( g_ptrSelectedFaces.GetSize() == g_ptrSelectedFaceBrushes.GetSize() ); - for ( int i = 0; i < nCount; i++ ) - { - face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( i ) ); - brush_t *selBrush = reinterpret_cast( g_ptrSelectedFaceBrushes.GetAt( i ) ); - Undo_AddBrush( selBrush ); - //++timo TODO: propagate the IShader* .. - SetFaceTexdef( selFace, texdef, brushprimit_texdef, bFitScale, static_cast( pPlugTexdef ) ); - Brush_Build( selBrush, bFitScale ); - Undo_EndBrush( selBrush ); - } - Undo_End(); +void Select_SetShader( const char* shader ){ + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushSetShader_Selected( GlobalSceneGraph(), shader ); + Scene_PatchSetShader_Selected( GlobalSceneGraph(), shader ); } - else if ( selected_brushes.next != &selected_brushes ) { - Undo_Start( "set brush textures" ); - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - if ( !b->owner->eclass->fixedsize ) { - Undo_AddBrush( b ); - Brush_SetTexture2( b, pShader, texdef, brushprimit_texdef, bFitScale, static_cast( pPlugTexdef ) ); - Undo_EndBrush( b ); - } - Undo_End(); - } - Sys_UpdateWindows( W_ALL ); + Scene_BrushSetShader_Component_Selected( GlobalSceneGraph(), shader ); } -#endif -/* - ============ - Select_SetTexture - Timo : bFitScale to compute scale on the plane and counteract plane / axial plane snapping - Timo : brush primitive texturing - the brushprimit_texdef given must be understood as a qtexture_t width=2 height=2 ( HiRes ) - Timo : texture plugin, added an IPluginTexdef* parameter - must be casted to an IPluginTexdef! - if not NULL, get ->Copy() of it into each face or brush ( and remember to hook ) - if NULL, means we have no information, ask for a default - ============ - */ -void WINAPI Select_SetTexture( texdef_t *texdef, brushprimit_texdef_t *brushprimit_texdef, bool bFitScale, void* pPlugTexdef ){ - /* - #ifdef _DEBUG - static int count = 0; - #endif - */ - brush_t *b; - /* - #ifdef _DEBUG - count++; - Sys_Printf("count: %d\n", count); - if(count==4) - Sys_Printf("break!\n"); - #endif - */ - int nCount = g_ptrSelectedFaces.GetSize(); - if ( nCount > 0 ) { - Undo_Start( "set face textures" ); - assert( g_ptrSelectedFaces.GetSize() == g_ptrSelectedFaceBrushes.GetSize() ); - for ( int i = 0; i < nCount; i++ ) - { - face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( i ) ); - brush_t *selBrush = reinterpret_cast( g_ptrSelectedFaceBrushes.GetAt( i ) ); - Undo_AddBrush( selBrush ); - SetFaceTexdef( selFace, texdef, brushprimit_texdef, bFitScale, static_cast( pPlugTexdef ) ); - Brush_Build( selBrush, bFitScale ); - Undo_EndBrush( selBrush ); - } - Undo_End(); +void Select_SetTexdef( const TextureProjection& projection ){ + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushSetTexdef_Selected( GlobalSceneGraph(), projection ); } - else if ( selected_brushes.next != &selected_brushes ) { - Undo_Start( "set brush textures" ); - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - if ( !b->owner->eclass->fixedsize ) { - Undo_AddBrush( b ); - Brush_SetTexture( b, texdef, brushprimit_texdef, bFitScale, static_cast( pPlugTexdef ) ); - Undo_EndBrush( b ); - } - Undo_End(); + Scene_BrushSetTexdef_Component_Selected( GlobalSceneGraph(), projection ); +} + +void Select_SetFlags( const ContentsFlagsValue& flags ){ + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushSetFlags_Selected( GlobalSceneGraph(), flags ); } - //++timo FIXME: not necessary in every cases, write a message defering / move one level up - Sys_UpdateWindows( W_ALL ); + Scene_BrushSetFlags_Component_Selected( GlobalSceneGraph(), flags ); } +void Select_GetBounds( Vector3& mins, Vector3& maxs ){ + AABB bounds; + Scene_BoundsSelected( GlobalSceneGraph(), bounds ); + maxs = vector3_added( bounds.origin, bounds.extents ); + mins = vector3_subtracted( bounds.origin, bounds.extents ); +} -/* - ================================================================ +void Select_GetMid( Vector3& mid ){ + AABB bounds; + Scene_BoundsSelected( GlobalSceneGraph(), bounds ); + mid = vector3_snapped( bounds.origin ); +} - TRANSFORMATIONS - ================================================================ - */ +void Select_FlipAxis( int axis ){ + Vector3 flip( 1, 1, 1 ); + flip[axis] = -1; + GlobalSelectionSystem().scaleSelected( flip ); +} -void Select_GetBounds( vec3_t mins, vec3_t maxs ){ - brush_t *b; - int i; - for ( i = 0 ; i < 3 ; i++ ) - { - mins[i] = 99999; - maxs[i] = -99999; - } +void Select_Scale( float x, float y, float z ){ + GlobalSelectionSystem().scaleSelected( Vector3( x, y, z ) ); +} + +enum axis_t +{ + eAxisX = 0, + eAxisY = 1, + eAxisZ = 2, +}; + +enum sign_t +{ + eSignPositive = 1, + eSignNegative = -1, +}; - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) +inline Matrix4 matrix4_rotation_for_axis90( axis_t axis, sign_t sign ){ + switch ( axis ) { - if ( b->owner->eclass->fixedsize ) { - for ( i = 0 ; i < 3 ; i++ ) - { - if ( b->owner->origin[i] < mins[i] ) { - mins[i] = b->owner->origin[i]; - } - if ( b->owner->origin[i] > maxs[i] ) { - maxs[i] = b->owner->origin[i]; - } - } + case eAxisX: + if ( sign == eSignPositive ) { + return matrix4_rotation_for_sincos_x( 1, 0 ); } else { - for ( i = 0 ; i < 3 ; i++ ) - { - if ( b->mins[i] < mins[i] ) { - mins[i] = b->mins[i]; - } - if ( b->maxs[i] > maxs[i] ) { - maxs[i] = b->maxs[i]; - } - } + return matrix4_rotation_for_sincos_x( -1, 0 ); + } + case eAxisY: + if ( sign == eSignPositive ) { + return matrix4_rotation_for_sincos_y( 1, 0 ); + } + else + { + return matrix4_rotation_for_sincos_y( -1, 0 ); + } + default: //case eAxisZ: + if ( sign == eSignPositive ) { + return matrix4_rotation_for_sincos_z( 1, 0 ); + } + else + { + return matrix4_rotation_for_sincos_z( -1, 0 ); } } } -void Select_GetTrueMid( vec3_t mid ){ - vec3_t mins, maxs; - Select_GetBounds( mins, maxs ); - - for ( int i = 0 ; i < 3 ; i++ ) - mid[i] = ( mins[i] + ( ( maxs[i] - mins[i] ) / 2 ) ); +inline void matrix4_rotate_by_axis90( Matrix4& matrix, axis_t axis, sign_t sign ){ + matrix4_multiply_by_matrix4( matrix, matrix4_rotation_for_axis90( axis, sign ) ); } -void Select_GetMid( vec3_t mid ){ - vec3_t mins, maxs; - int i; - - if ( !g_PrefsDlg.m_bSnap ) { - Select_GetTrueMid( mid ); - return; - } - - Select_GetBounds( mins, maxs ); - - for ( i = 0 ; i < 3 ; i++ ) - mid[i] = g_qeglobals.d_gridsize * floor( ( ( mins[i] + maxs[i] ) * 0.5 ) / g_qeglobals.d_gridsize ); +inline void matrix4_pivoted_rotate_by_axis90( Matrix4& matrix, axis_t axis, sign_t sign, const Vector3& pivotpoint ){ + matrix4_translate_by_vec3( matrix, pivotpoint ); + matrix4_rotate_by_axis90( matrix, axis, sign ); + matrix4_translate_by_vec3( matrix, vector3_negated( pivotpoint ) ); } -vec3_t select_origin; -vec3_t select_matrix[3]; -qboolean select_fliporder; - -// FIXME: bApplyBPrimit is supposed to be temporary -// TODO: manage Brush_Build calls, too many of them with the texture processing -// FIXME: the undo doesn't seem to work correctly on texturing and flip/rotate operations?? this is not supposed to be related to the texture locking code, so what is happening? -// FIXME: ApplyMatrix works on flipping operation, b0rks on Rotations (so does the "regular" rotation code??) -// FIXME: what is getting called in free rotation mode? that used to work right? -void Select_ApplyMatrix( bool bSnap, bool bRotation, int nAxis, float fDeg ){ //, qboolean bApplyBPrimit) - brush_t *b; - face_t *f; - int i, j; - vec3_t temp, tmporigin; - - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) +inline Quaternion quaternion_for_axis90( axis_t axis, sign_t sign ){ +#if 1 + switch ( axis ) { - if ( b->owner->eclass->fixedsize ) { - VectorCopy( b->owner->origin, tmporigin ); - // transform the origin point - VectorSubtract( b->owner->origin, select_origin, temp ); - for ( j = 0 ; j < 3 ; j++ ) - b->owner->origin[j] = DotProduct( temp, select_matrix[j] ) + select_origin[j]; - - // update the origin key - char text[64]; - sprintf( text, "%i %i %i", - (int)b->owner->origin[0], (int)b->owner->origin[1], (int)b->owner->origin[2] ); - SetKeyValue( b->owner, "origin", text ); - - /*\todo remove brush-based bounding box for fixedsize entities */ - VectorSubtract( b->owner->origin, tmporigin, temp ); - for ( f = b->brush_faces ; f ; f = f->next ) - { - // move fixedsize bbox to new origin - for ( i = 0 ; i < 3 ; i++ ) - VectorAdd( f->planepts[i], temp, f->planepts[i] ); - } - Brush_Build( b, bSnap,true,false,false ); // don't filter - + case eAxisX: + if ( sign == eSignPositive ) { + return Quaternion( c_half_sqrt2f, 0, 0, c_half_sqrt2f ); } - else if ( b->patchBrush ) { - if ( !bRotation && !( ( g_qeglobals.d_select_mode == sel_curvepoint && g_qeglobals.d_num_move_points != 0 ) || g_bPatchBendMode ) ) { - // invert patch if this is a mirroring operation, unless points are selected or bendmode is active - patchInvert( b->pPatch ); - } - // NOTE: does not clamp points to integers - Patch_ApplyMatrix( b->pPatch, select_origin, select_matrix, false ); + else + { + return Quaternion( -c_half_sqrt2f, 0, 0, -c_half_sqrt2f ); + } + case eAxisY: + if ( sign == eSignPositive ) { + return Quaternion( 0, c_half_sqrt2f, 0, c_half_sqrt2f ); } else { - for ( f = b->brush_faces ; f ; f = f->next ) - { - // FIXME: only in BP mode! - // if we are using Brush Primitives texturing, we need to compute the texture matrix after the geometric transformation - // (with the default texturing you don't need to compute anything for flipping and mirroring operations) - // if (bApplyBPrimit) { - // ApplyMatrix_BrushPrimit (f, select_matrix, select_origin, select_fliporder); - // } - for ( i = 0 ; i < 3 ; i++ ) - { - VectorSubtract( f->planepts[i], select_origin, temp ); - for ( j = 0 ; j < 3 ; j++ ) - f->planepts[i][j] = DotProduct( temp, select_matrix[j] ) + select_origin[j]; - } - if ( select_fliporder ) { - VectorCopy( f->planepts[0], temp ); - VectorCopy( f->planepts[2], f->planepts[0] ); - VectorCopy( temp, f->planepts[2] ); - } - } - Brush_Build( b, bSnap,true,false,false ); // don't filter + return Quaternion( 0, -c_half_sqrt2f, 0, -c_half_sqrt2f ); + } + default: //case eAxisZ: + if ( sign == eSignPositive ) { + return Quaternion( 0, 0, c_half_sqrt2f, c_half_sqrt2f ); + } + else + { + return Quaternion( 0, 0, -c_half_sqrt2f, -c_half_sqrt2f ); } } +#else + quaternion_for_matrix4_rotation( matrix4_rotation_for_axis90( (axis_t)axis, ( deg > 0 ) ? eSignPositive : eSignNegative ) ); +#endif } -void ProjectOnPlane( vec3_t& normal,float dist,vec3_t& ez, vec3_t& p ){ - if ( fabs( ez[0] ) == 1 ) { - p[0] = ( dist - normal[1] * p[1] - normal[2] * p[2] ) / normal[0]; - } - else if ( fabs( ez[1] ) == 1 ) { - p[1] = ( dist - normal[0] * p[0] - normal[2] * p[2] ) / normal[1]; +void Select_RotateAxis( int axis, float deg ){ + if ( fabs( deg ) == 90.f ) { + GlobalSelectionSystem().rotateSelected( quaternion_for_axis90( (axis_t)axis, ( deg > 0 ) ? eSignPositive : eSignNegative ) ); } - else{ - p[2] = ( dist - normal[0] * p[0] - normal[1] * p[1] ) / normal[2]; + else + { + switch ( axis ) + { + case 0: + GlobalSelectionSystem().rotateSelected( quaternion_for_matrix4_rotation( matrix4_rotation_for_x_degrees( deg ) ) ); + break; + case 1: + GlobalSelectionSystem().rotateSelected( quaternion_for_matrix4_rotation( matrix4_rotation_for_y_degrees( deg ) ) ); + break; + case 2: + GlobalSelectionSystem().rotateSelected( quaternion_for_matrix4_rotation( matrix4_rotation_for_z_degrees( deg ) ) ); + break; + } } } -void Back( vec3_t& dir, vec3_t& p ){ - if ( fabs( dir[0] ) == 1 ) { - p[0] = 0; - } - else if ( fabs( dir[1] ) == 1 ) { - p[1] = 0; + +void Select_ShiftTexture( float x, float y ){ + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushShiftTexdef_Selected( GlobalSceneGraph(), x, y ); + Scene_PatchTranslateTexture_Selected( GlobalSceneGraph(), x, y ); } - else{p[2] = 0; } + //globalOutputStream() << "shift selected face textures: s=" << x << " t=" << y << '\n'; + Scene_BrushShiftTexdef_Component_Selected( GlobalSceneGraph(), x, y ); } - - -// using scale[0] and scale[1] -void ComputeScale( vec3_t& rex, vec3_t& rey, vec3_t& p, face_t* f ){ - float px = DotProduct( rex, p ); - float py = DotProduct( rey, p ); - px *= f->texdef.scale[0]; - py *= f->texdef.scale[1]; - vec3_t aux; - VectorCopy( rex, aux ); - VectorScale( aux, px, aux ); - VectorCopy( aux, p ); - VectorCopy( rey, aux ); - VectorScale( aux, py, aux ); - VectorAdd( p, aux, p ); +void Select_ScaleTexture( float x, float y ){ + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushScaleTexdef_Selected( GlobalSceneGraph(), x, y ); + Scene_PatchScaleTexture_Selected( GlobalSceneGraph(), x, y ); + } + Scene_BrushScaleTexdef_Component_Selected( GlobalSceneGraph(), x, y ); } -void ComputeAbsolute( face_t* f, vec3_t& p1, vec3_t& p2, vec3_t& p3 ){ - vec3_t ex,ey,ez; // local axis base - -#ifdef _DEBUG - if ( g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning : illegal call of ComputeAbsolute in brush primitive mode\n" ); +void Select_RotateTexture( float amt ){ + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushRotateTexdef_Selected( GlobalSceneGraph(), amt ); + Scene_PatchRotateTexture_Selected( GlobalSceneGraph(), amt ); } -#endif - - // compute first local axis base - TextureAxisFromPlane( &f->plane, ex, ey ); - CrossProduct( ex, ey, ez ); - - vec3_t aux; - VectorCopy( ex, aux ); - VectorScale( aux, -f->texdef.shift[0], aux ); - VectorCopy( aux, p1 ); - VectorCopy( ey, aux ); - VectorScale( aux, -f->texdef.shift[1], aux ); - VectorAdd( p1, aux, p1 ); - VectorCopy( p1, p2 ); - VectorAdd( p2, ex, p2 ); - VectorCopy( p1, p3 ); - VectorAdd( p3, ey, p3 ); - VectorCopy( ez, aux ); - VectorScale( aux, -f->texdef.rotate, aux ); - VectorRotate( p1, aux, p1 ); - VectorRotate( p2, aux, p2 ); - VectorRotate( p3, aux, p3 ); - // computing rotated local axis base - vec3_t rex,rey; - VectorCopy( ex, rex ); - VectorRotate( rex, aux, rex ); - VectorCopy( ey, rey ); - VectorRotate( rey, aux, rey ); - - ComputeScale( rex,rey,p1,f ); - ComputeScale( rex,rey,p2,f ); - ComputeScale( rex,rey,p3,f ); - - // project on normal plane - // along ez - // assumes plane normal is normalized - ProjectOnPlane( f->plane.normal,f->plane.dist,ez,p1 ); - ProjectOnPlane( f->plane.normal,f->plane.dist,ez,p2 ); - ProjectOnPlane( f->plane.normal,f->plane.dist,ez,p3 ); -}; + Scene_BrushRotateTexdef_Component_Selected( GlobalSceneGraph(), amt ); +} +// TTimo modified to handle shader architecture: +// expects shader names at input, comparison relies on shader names .. texture names no longer relevant +void FindReplaceTextures( const char* pFind, const char* pReplace, bool bSelected ){ + if ( !texdef_name_valid( pFind ) ) { + globalErrorStream() << "FindReplaceTextures: invalid texture name: '" << pFind << "', aborted\n"; + return; + } + if ( !texdef_name_valid( pReplace ) ) { + globalErrorStream() << "FindReplaceTextures: invalid texture name: '" << pReplace << "', aborted\n"; + return; + } -void AbsoluteToLocal( plane_t normal2, face_t* f, vec3_t& p1, vec3_t& p2, vec3_t& p3 ){ - vec3_t ex,ey,ez; + StringOutputStream command; + command << "textureFindReplace -find " << pFind << " -replace " << pReplace; + UndoableCommand undo( command.c_str() ); -#ifdef _DEBUG - if ( g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning : illegal call of AbsoluteToLocal in brush primitive mode\n" ); + if ( bSelected ) { + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushFindReplaceShader_Selected( GlobalSceneGraph(), pFind, pReplace ); + Scene_PatchFindReplaceShader_Selected( GlobalSceneGraph(), pFind, pReplace ); + } + Scene_BrushFindReplaceShader_Component_Selected( GlobalSceneGraph(), pFind, pReplace ); } -#endif - - // computing new local axis base - TextureAxisFromPlane( &normal2, ex, ey ); - CrossProduct( ex, ey, ez ); - - // projecting back on (ex,ey) - Back( ez,p1 ); - Back( ez,p2 ); - Back( ez,p3 ); - - vec3_t aux; - // rotation - VectorCopy( p2, aux ); - VectorSubtract( aux, p1,aux ); - - float x = DotProduct( aux,ex ); - float y = DotProduct( aux,ey ); - f->texdef.rotate = 180 * atan2( y,x ) / Q_PI; - - vec3_t rex,rey; - // computing rotated local axis base - VectorCopy( ez, aux ); - VectorScale( aux, f->texdef.rotate, aux ); - VectorCopy( ex, rex ); - VectorRotate( rex, aux, rex ); - VectorCopy( ey, rey ); - VectorRotate( rey, aux, rey ); - - // scale - VectorCopy( p2, aux ); - VectorSubtract( aux, p1, aux ); - f->texdef.scale[0] = DotProduct( aux, rex ); - VectorCopy( p3, aux ); - VectorSubtract( aux, p1, aux ); - f->texdef.scale[1] = DotProduct( aux, rey ); - - // shift - // only using p1 - x = DotProduct( rex,p1 ); - y = DotProduct( rey,p1 ); - x /= f->texdef.scale[0]; - y /= f->texdef.scale[1]; - - VectorCopy( rex, p1 ); - VectorScale( p1, x, p1 ); - VectorCopy( rey, aux ); - VectorScale( aux, y, aux ); - VectorAdd( p1, aux, p1 ); - VectorCopy( ez, aux ); - VectorScale( aux, -f->texdef.rotate, aux ); - VectorRotate( p1, aux, p1 ); - f->texdef.shift[0] = -DotProduct( p1, ex ); - f->texdef.shift[1] = -DotProduct( p1, ey ); - - // stored rot is good considering local axis base - // change it if necessary - f->texdef.rotate = -f->texdef.rotate; - - Clamp( f->texdef.shift[0], f->d_texture->width ); - Clamp( f->texdef.shift[1], f->d_texture->height ); - Clamp( f->texdef.rotate, 360 ); - -} - -void RotateFaceTexture( face_t* f, int nAxis, float fDeg ){ - vec3_t p1,p2,p3, rota; - p1[0] = p1[1] = p1[2] = 0; - VectorCopy( p1, p2 ); - VectorCopy( p1, p3 ); - VectorCopy( p1, rota ); - ComputeAbsolute( f, p1, p2, p3 ); - - rota[nAxis] = fDeg; - VectorRotateOrigin( p1, rota, select_origin, p1 ); - VectorRotateOrigin( p2, rota, select_origin, p2 ); - VectorRotateOrigin( p3, rota, select_origin, p3 ); - - plane_t normal2; - vec3_t vNormal; - vNormal[0] = f->plane.normal[0]; - vNormal[1] = f->plane.normal[1]; - vNormal[2] = f->plane.normal[2]; - VectorRotate( vNormal, rota, vNormal ); - normal2.normal[0] = vNormal[0]; - normal2.normal[1] = vNormal[1]; - normal2.normal[2] = vNormal[2]; - AbsoluteToLocal( normal2, f, p1, p2,p3 ); - -} - -void RotateTextures( int nAxis, float fDeg, vec3_t vOrigin ){ - for ( brush_t* b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) + else { - for ( face_t* f = b->brush_faces ; f ; f = f->next ) - { - if ( g_qeglobals.m_bBrushPrimitMode ) { - RotateFaceTexture_BrushPrimit( f, nAxis, fDeg, vOrigin ); - } - else{ - RotateFaceTexture( f, nAxis, fDeg ); - } - } - Brush_Build( b, false,true,false,false ); // don't filter + Scene_BrushFindReplaceShader( GlobalSceneGraph(), pFind, pReplace ); + Scene_PatchFindReplaceShader( GlobalSceneGraph(), pFind, pReplace ); } } -void Select_ApplyMatrix_BrushPrimit(){ - #ifdef _DEBUG - if ( !g_qeglobals.m_bBrushPrimitMode ) { - Sys_FPrintf( SYS_ERR,"ERROR: Select_ApplyMatrix_BrushPrimit called in non-BP mode\n" ); - } - #endif - for ( brush_t* b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) +typedef std::vector PropertyValues; + +bool propertyvalues_contain( const PropertyValues& propertyvalues, const char *str ){ + for ( PropertyValues::const_iterator i = propertyvalues.begin(); i != propertyvalues.end(); ++i ) { - for ( face_t* f = b->brush_faces ; f ; f = f->next ) - { - ApplyMatrix_BrushPrimit( f, select_matrix, select_origin ); + if ( string_equal( str, *i ) ) { + return true; } } + return false; } -void Select_FlipAxis( int axis ){ - int i; - - Select_GetMid( select_origin ); - for ( i = 0 ; i < 3 ; i++ ) - { - VectorCopy( vec3_origin, select_matrix[i] ); - select_matrix[i][i] = 1; - } - select_matrix[axis][axis] = -1; - select_fliporder = true; - - // texture locking - if ( g_PrefsDlg.m_bRotateLock ) { - // axis flipping inverts space orientation, we have to use a general texture locking algorithm instead of the RotateFaceTexture - if ( g_qeglobals.m_bBrushPrimitMode ) { - Select_ApplyMatrix_BrushPrimit(); - } - else - { - // there's never been flip locking for non BP mode, this would be tricky to write and there's not much interest for it with the coming of BP format - // what could be done is converting regular to BP, locking, then back to regular :) - Sys_FPrintf( SYS_WRN, "WARNING: regular texturing doesn't have texture lock on flipping operations\n" ); - } +class EntityFindByPropertyValueWalker : public scene::Graph::Walker +{ +const PropertyValues& m_propertyvalues; +const char *m_prop; +public: +EntityFindByPropertyValueWalker( const char *prop, const PropertyValues& propertyvalues ) + : m_propertyvalues( propertyvalues ), m_prop( prop ){ +} +bool pre( const scene::Path& path, scene::Instance& instance ) const { + Entity* entity = Node_getEntity( path.top() ); + if ( entity != 0 + && propertyvalues_contain( m_propertyvalues, entity->getKeyValue( m_prop ) ) ) { + Instance_getSelectable( instance )->setSelected( true ); } - // geometric transformation - Select_ApplyMatrix( true, false, 0, 0 ); - Sys_UpdateWindows( W_ALL ); + return true; } +}; +void Scene_EntitySelectByPropertyValues( scene::Graph& graph, const char *prop, const PropertyValues& propertyvalues ){ + graph.traverse( EntityFindByPropertyValueWalker( prop, propertyvalues ) ); +} -void Select_Scale( float x, float y, float z ){ - Select_GetMid( select_origin ); - for ( brush_t* b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - { - // ignore fixedsize entities - if ( b->owner->eclass->fixedsize ) { - continue; - } - for ( face_t* f = b->brush_faces ; f ; f = f->next ) - { - for ( int i = 0 ; i < 3 ; i++ ) - { - f->planepts[i][0] -= select_origin[0]; - f->planepts[i][1] -= select_origin[1]; - f->planepts[i][2] -= select_origin[2]; - f->planepts[i][0] *= x; - f->planepts[i][1] *= y; - f->planepts[i][2] *= z; - - f->planepts[i][0] += select_origin[0]; - f->planepts[i][1] += select_origin[1]; - f->planepts[i][2] += select_origin[2]; +class EntityGetSelectedPropertyValuesWalker : public scene::Graph::Walker +{ +PropertyValues& m_propertyvalues; +const char *m_prop; +public: +EntityGetSelectedPropertyValuesWalker( const char *prop, PropertyValues& propertyvalues ) + : m_propertyvalues( propertyvalues ), m_prop( prop ){ +} +bool pre( const scene::Path& path, scene::Instance& instance ) const { + Selectable* selectable = Instance_getSelectable( instance ); + if ( selectable != 0 + && selectable->isSelected() ) { + Entity* entity = Node_getEntity( path.top() ); + if ( entity != 0 ) { + if ( !propertyvalues_contain( m_propertyvalues, entity->getKeyValue( m_prop ) ) ) { + m_propertyvalues.push_back( entity->getKeyValue( m_prop ) ); } } - Brush_Build( b, false,true,false,false ); // don't filter - if ( b->patchBrush ) { - vec3_t v; - v[0] = x; - v[1] = y; - v[2] = z; - Patch_Scale( b->pPatch, select_origin, v ); - } } + return true; } +}; -void Select_RotateAxis( int axis, float deg, bool bPaint, bool bMouse ){ - int i; - vec_t c, s; - - if ( deg == 0 ) { - return; - } - - if ( bMouse ) { - VectorCopy( g_pParentWnd->ActiveXY()->RotateOrigin(), select_origin ); - } - else - { - Select_GetMid( select_origin ); - } +void Scene_EntityGetPropertyValues( scene::Graph& graph, const char *prop, PropertyValues& propertyvalues ){ + graph.traverse( EntityGetSelectedPropertyValuesWalker( prop, propertyvalues ) ); +} - /* - if(axis == 2) - { - vec3_t rotation; - VectorSet(rotation, 0, 0, 360 - deg); - for(brush_t *b = selected_brushes.next; b != &selected_brushes; b = b->next) - if(b->owner->model.pEdit) - b->owner->model.pEdit->Rotate(select_origin, rotation); - } - */ - - select_fliporder = false; - - // the "90" degrees algorithm is mostly used on axis rotate as a speedup and possibly avoiding rounding errors as much as possible - // previous implementation was doing an indirect-oriented rotation over the plane whereas the general algo below was doing a direct-oriented rotation - // this was confusing the texture locking algorithms, fixed it to be direct-oriented (side consequence is that the axis rotate toolbar button rotates the other way now) - // NOTE: previous algo was using vec3_origin in the matrix computation.. - // I don't see what an origin does in linear transformations (3x3 matrixes always relate to a (0,0,0) origin) - // in Radiant it's initialized as (0,0,0) and never set to another value - // so I got rid of it when it's not used for initialisation tasks (and even if it's not (0,0,0) it should not matter - if ( deg == 90 ) { - c = 0; - s = 1; +void Select_AllOfType(){ + if ( GlobalSelectionSystem().Mode() == SelectionSystem::eComponent ) { + if ( GlobalSelectionSystem().ComponentMode() == SelectionSystem::eFace ) { + GlobalSelectionSystem().setSelectedAllComponents( false ); + Scene_BrushSelectByShader_Component( GlobalSceneGraph(), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) ); + } } else { - c = cos( deg * Q_PI / 180.0 ); - s = sin( deg * Q_PI / 180.0 ); - } - - for ( i = 0 ; i < 3 ; i++ ) - { - VectorCopy( vec3_origin, select_matrix[i] ); - select_matrix[i][i] = 1; - } - - switch ( axis ) - { - case 0: - select_matrix[1][1] = c; - select_matrix[1][2] = s; - select_matrix[2][1] = -s; - select_matrix[2][2] = c; - break; - case 1: - select_matrix[0][0] = c; - select_matrix[0][2] = s; - select_matrix[2][0] = -s; - select_matrix[2][2] = c; - break; - case 2: - select_matrix[0][0] = c; - select_matrix[0][1] = s; - select_matrix[1][0] = -s; - select_matrix[1][1] = c; - break; - } - - - // texture locking - if ( g_PrefsDlg.m_bRotateLock ) { - // Terrible hack, reversing input rotation angle to correct - // texture rotation direction for X and Z axes. - // RotateTextures needs to be changed to fix this properly? - if ( axis == 1 ) { - RotateTextures( axis, deg, select_origin ); + PropertyValues propertyvalues; + const char *prop = EntityInspector_getCurrentKey(); + if ( !prop || !*prop ) { + prop = "classname"; } - else{ - RotateTextures( axis, deg * -1, select_origin ); + Scene_EntityGetPropertyValues( GlobalSceneGraph(), prop, propertyvalues ); + GlobalSelectionSystem().setSelectedAll( false ); + if ( !propertyvalues.empty() ) { + Scene_EntitySelectByPropertyValues( GlobalSceneGraph(), prop, propertyvalues ); } - } - // geometric transformation - Select_ApplyMatrix( !bMouse, true, axis, deg ); //, false); - - if ( bPaint ) { - Sys_UpdateWindows( W_ALL ); - } -} - -/* - ================================================================ - - GROUP SELECTIONS - - ================================================================ - */ - -void Select_RealCompleteTall( vec3_t mins, vec3_t maxs ){ - brush_t *b, *next; - - int nDim1 = ( g_pParentWnd->ActiveXY()->GetViewType() == YZ ) ? 1 : 0; - int nDim2 = ( g_pParentWnd->ActiveXY()->GetViewType() == XY ) ? 1 : 2; - - g_qeglobals.d_select_mode = sel_brush; - - for ( b = active_brushes.next ; b != &active_brushes ; b = next ) - { - next = b->next; - - if ( b->bFiltered ) { - continue; - } - - if ( ( b->maxs[nDim1] > maxs[nDim1] || b->mins[nDim1] < mins[nDim1] ) - || ( b->maxs[nDim2] > maxs[nDim2] || b->mins[nDim2] < mins[nDim2] ) ) { - continue; + else + { + Scene_BrushSelectByShader( GlobalSceneGraph(), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) ); + Scene_PatchSelectByShader( GlobalSceneGraph(), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) ); } - - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); } } -void Select_CompleteTall( void ){ - vec3_t mins, maxs; - - if ( !QE_SingleBrush() ) { - return; - } - - Undo_Start( "select complete tall" ); - Undo_AddBrushList( &selected_brushes ); - Undo_End(); - - VectorCopy( selected_brushes.next->mins, mins ); - VectorCopy( selected_brushes.next->maxs, maxs ); - Select_Delete(); - - Select_RealCompleteTall( mins, maxs ); - Sys_UpdateWindows( W_ALL ); -} - -void Select_PartialTall( void ){ - brush_t *b, *next; - vec3_t mins, maxs; - - if ( !QE_SingleBrush() ) { - return; - } - - Undo_Start( "select complete tall" ); - Undo_AddBrushList( &selected_brushes ); - Undo_End(); - - g_qeglobals.d_select_mode = sel_brush; - - VectorCopy( selected_brushes.next->mins, mins ); - VectorCopy( selected_brushes.next->maxs, maxs ); - Select_Delete(); - - int nDim1 = ( g_pParentWnd->ActiveXY()->GetViewType() == YZ ) ? 1 : 0; - int nDim2 = ( g_pParentWnd->ActiveXY()->GetViewType() == XY ) ? 1 : 2; - - for ( b = active_brushes.next ; b != &active_brushes ; b = next ) - { - next = b->next; - - if ( b->bFiltered ) { - continue; - } - - if ( ( b->mins[nDim1] > maxs[nDim1] || b->maxs[nDim1] < mins[nDim1] ) - || ( b->mins[nDim2] > maxs[nDim2] || b->maxs[nDim2] < mins[nDim2] ) ) { - continue; - } - - - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); - } - - Sys_UpdateWindows( W_ALL ); +void Select_Inside( void ){ + SelectByBounds::DoSelection(); } void Select_Touching( void ){ - brush_t *b, *next; - int i; - vec3_t mins, maxs; - - if ( !QE_SingleBrush() ) { - return; - } - - g_qeglobals.d_select_mode = sel_brush; - - VectorCopy( selected_brushes.next->mins, mins ); - VectorCopy( selected_brushes.next->maxs, maxs ); - - for ( b = active_brushes.next ; b != &active_brushes ; b = next ) - { - next = b->next; - - if ( b->bFiltered ) { - continue; - } - - for ( i = 0 ; i < 3 ; i++ ) - if ( b->mins[i] > maxs[i] + 1 || b->maxs[i] < mins[i] - 1 ) { - break; - } + SelectByBounds::DoSelection( false ); +} - if ( i == 3 ) { - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); - } +void Select_FitTexture( float horizontal, float vertical ){ + if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) { + Scene_BrushFitTexture_Selected( GlobalSceneGraph(), horizontal, vertical ); } + Scene_BrushFitTexture_Component_Selected( GlobalSceneGraph(), horizontal, vertical ); - Sys_UpdateWindows( W_ALL ); + SceneChangeNotify(); } -void Select_Inside( void ){ - brush_t *b, *next; - int i; - vec3_t mins, maxs; +inline void hide_node( scene::Node& node, bool hide ){ + hide + ? node.enable( scene::Node::eHidden ) + : node.disable( scene::Node::eHidden ); +} - if ( !QE_SingleBrush() ) { - return; +class HideSelectedWalker : public scene::Graph::Walker +{ +bool m_hide; +public: +HideSelectedWalker( bool hide ) + : m_hide( hide ){ +} +bool pre( const scene::Path& path, scene::Instance& instance ) const { + Selectable* selectable = Instance_getSelectable( instance ); + if ( selectable != 0 + && selectable->isSelected() ) { + hide_node( path.top(), m_hide ); } + return true; +} +}; - Undo_Start( "select inside" ); - Undo_AddBrushList( &selected_brushes ); - Undo_End(); +void Scene_Hide_Selected( bool hide ){ + GlobalSceneGraph().traverse( HideSelectedWalker( hide ) ); +} - g_qeglobals.d_select_mode = sel_brush; +void Select_Hide(){ + Scene_Hide_Selected( true ); + SceneChangeNotify(); +} - VectorCopy( selected_brushes.next->mins, mins ); - VectorCopy( selected_brushes.next->maxs, maxs ); - Select_Delete(); +void HideSelected(){ + Select_Hide(); + GlobalSelectionSystem().setSelectedAll( false ); +} - for ( b = active_brushes.next ; b != &active_brushes ; b = next ) - { - next = b->next; - if ( b->bFiltered ) { - continue; - } +class HideAllWalker : public scene::Graph::Walker +{ +bool m_hide; +public: +HideAllWalker( bool hide ) + : m_hide( hide ){ +} +bool pre( const scene::Path& path, scene::Instance& instance ) const { + hide_node( path.top(), m_hide ); + return true; +} +}; - for ( i = 0 ; i < 3 ; i++ ) - if ( b->maxs[i] > maxs[i] || b->mins[i] < mins[i] ) { - break; - } - if ( i == 3 ) { - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); - } - } +void Scene_Hide_All( bool hide ){ + GlobalSceneGraph().traverse( HideAllWalker( hide ) ); +} - Sys_UpdateWindows( W_ALL ); +void Select_ShowAllHidden(){ + Scene_Hide_All( false ); + SceneChangeNotify(); } -void Select_SelectGroup( entity_t* group ){ - brush_t* b; - //brush_t* next; - Undo_Start( "select func group" ); - Undo_AddBrushList( &selected_brushes ); - Undo_End(); - Select_Deselect(); +void Selection_Flipx(){ + UndoableCommand undo( "mirrorSelected -axis x" ); + Select_FlipAxis( 0 ); +} - b = &group->brushes; +void Selection_Flipy(){ + UndoableCommand undo( "mirrorSelected -axis y" ); + Select_FlipAxis( 1 ); +} - do - { - b = b->onext; - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); - } while ( b->onext != &group->brushes ); +void Selection_Flipz(){ + UndoableCommand undo( "mirrorSelected -axis z" ); + Select_FlipAxis( 2 ); +} - Sys_UpdateWindows( W_ALL ); +void Selection_Rotatex(){ + UndoableCommand undo( "rotateSelected -axis x -angle -90" ); + Select_RotateAxis( 0,-90 ); } +void Selection_Rotatey(){ + UndoableCommand undo( "rotateSelected -axis y -angle 90" ); + Select_RotateAxis( 1, 90 ); +} -void Select_Ungroup( void ){ - int numselectedgroups; - entity_t *e; - brush_t *b,* sb; +void Selection_Rotatez(){ + UndoableCommand undo( "rotateSelected -axis z -angle -90" ); + Select_RotateAxis( 2,-90 ); +} - numselectedgroups = 0; - for ( sb = selected_brushes.next; sb != &selected_brushes; sb = sb->next ) - { - e = sb->owner; - if ( e == world_entity || e->eclass->fixedsize ) { - continue; - } - for ( b = e->brushes.onext; b != &e->brushes; b = e->brushes.onext ) - { - Entity_UnlinkBrush( b ); - Entity_LinkBrush( world_entity, b ); - } - Entity_Free( e ); - numselectedgroups++; - } +void Nudge( int nDim, float fNudge ){ + Vector3 translate( 0, 0, 0 ); + translate[nDim] = fNudge; - if ( numselectedgroups <= 0 ) { - Sys_Printf( "No grouped entities selected.\n" ); - return; - } - Sys_Printf( "Ungrouped %d entit%s.\n", numselectedgroups, ( numselectedgroups == 1 ) ? "y" : "ies" ); - Sys_UpdateWindows( W_ALL ); + GlobalSelectionSystem().translateSelected( translate ); } -/*! - group selected brushes into specified entity - if an entity is empty afterwards, destroy it - */ -void Select_GroupEntity( entity_t* group ){ - entity_t* e; - brush_t *b; +void Selection_NudgeZ( float amount ){ + StringOutputStream command; + command << "nudgeSelected -axis z -amount " << amount; + UndoableCommand undo( command.c_str() ); - if ( group->eclass->fixedsize ) { - Sys_FPrintf( SYS_ERR, "Select_GroupEntity: can't group anything to a fixedsize entity\n" ); - return; - } - - for ( b = selected_brushes.next; b != &selected_brushes; b = b->next ) - { - if ( b->owner->eclass->fixedsize ) { - continue; - } - e = b->owner; - Entity_UnlinkBrush( b ); - Entity_LinkBrush( group, b ); - if ( e != world_entity && e->brushes.onext == &e->brushes ) { - Undo_AddEntity( e ); - Entity_Free( e ); - } - } + Nudge( 2, amount ); } -/*! - merge all selected entities together into the first one selected - NOTE: makes use of order of selected_brushes list - can be used to move world brushes in an entity, or to merge several ents together - NOTE: didn't devise a strategy on the epairs, we merge into the first entity and use those - */ -void Select_MergeEntity(){ - entity_t* e = NULL; - brush_t* b; - for ( b = selected_brushes.next; b != &selected_brushes; b = b->next ) - { - if ( !b->owner->eclass->fixedsize ) { - e = b->owner; - break; - } - } - - if ( e != NULL ) { - Select_GroupEntity( e ); - - int count = 0; - for ( b = e->brushes.onext; b != &e->brushes; b = b->onext ) - { - //Brush_RemoveFromList (b); - //Brush_AddToList(b, &active_brushes); - count++; - } - Sys_Printf( "Merged %d brushes into %s entity\n", count, ValueForKey( e, "classname" ) ); - } +void Selection_MoveDown(){ + Selection_NudgeZ( -GetGridSize() ); } -/* - ==================== - Select_Seperate - ==================== - */ -void Select_Seperate( void ) { - Select_GroupEntity( world_entity ); +void Selection_MoveUp(){ + Selection_NudgeZ( GetGridSize() ); } -/* - ==================== - Select_MakeStructural - ==================== - */ -void Select_MakeStructural( void ){ - brush_t *b; - face_t *f; - - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - { - for ( f = b->brush_faces ; f ; f = f->next ) - f->texdef.contents &= ~CONTENTS_DETAIL; - b->bFiltered = FilterBrush( b ); - } - Select_Deselect(); - Sys_UpdateWindows( W_ALL ); +void SceneSelectionChange( const Selectable& selectable ){ + SceneChangeNotify(); } -void Select_MakeDetail( void ){ - brush_t *b; - face_t *f; +SignalHandlerId Selection_boundsChanged; - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - { - for ( f = b->brush_faces ; f ; f = f->next ) - f->texdef.contents |= CONTENTS_DETAIL; - b->bFiltered = FilterBrush( b ); - } - Select_Deselect(); - Sys_UpdateWindows( W_ALL ); -} - -// brush primitive texture adjustments, use the camera view to map adjustments -// ShiftTextureRelative_BrushPrimit ( s , t ) will shift relative to the texture -void ShiftTextureRelative_Camera( face_t *f, int x, int y ){ - vec3_t vecS, vecT; - vec_t XY[2]; // the values we are going to send for translation - vec_t sgn[2]; // +1 or -1 - int axis[2]; - CamWnd* pCam; - - // get the two relative texture axes for the current texturing - BrushPrimit_GetRelativeAxes( f, vecS, vecT ); - - // center point of the face, project it on the camera space - vec3_t C; - VectorClear( C ); - int i; - for ( i = 0; i < f->face_winding->numpoints; i++ ) - { - VectorAdd( C,f->face_winding->points[i],C ); - } - VectorScale( C,1.0 / f->face_winding->numpoints,C ); - - pCam = g_pParentWnd->GetCamWnd(); - pCam->MatchViewAxes( C, vecS, axis[0], sgn[0] ); - pCam->MatchViewAxes( C, vecT, axis[1], sgn[1] ); - - // this happens when the two directions can't be mapped on two different directions on the screen - // then the move will occur against a single axis - // (i.e. the user is not positioned well enough to send understandable shift commands) - // NOTE: in most cases this warning is not very relevant because the user would use one of the two axes - // for which the solution is easy (the other one being unknown) - // so this warning could be removed - if ( axis[0] == axis[1] ) { - Sys_FPrintf( SYS_WRN, "Warning: degenerate in ShiftTextureRelative_Camera\n" ); - } - - // compute the X Y geometric increments - // those geometric increments will be applied along the texture axes (the ones we computed above) - XY[0] = 0; - XY[1] = 0; - if ( x != 0 ) { - // moving right/left - XY[axis[0]] += sgn[0] * x; - } - if ( y != 0 ) { - XY[axis[1]] += sgn[1] * y; - } - // we worked out a move along vecS vecT, and we now it's geometric amplitude - // apply it - ShiftTextureRelative_BrushPrimit( f, XY[0], XY[1] ); +void Selection_construct(){ + typedef FreeCaller SceneSelectionChangeCaller; + GlobalSelectionSystem().addSelectionChangeCallback( SceneSelectionChangeCaller() ); + typedef FreeCaller UpdateWorkzoneForSelectionChangedCaller; + GlobalSelectionSystem().addSelectionChangeCallback( UpdateWorkzoneForSelectionChangedCaller() ); + typedef FreeCaller UpdateWorkzoneForSelectionCaller; + Selection_boundsChanged = GlobalSceneGraph().addBoundsChangedCallback( UpdateWorkzoneForSelectionCaller() ); } -void Select_ShiftTexture( int x, int y ){ - brush_t *b; - face_t *f; +void Selection_destroy(){ + GlobalSceneGraph().removeBoundsChangedCallback( Selection_boundsChanged ); +} - int nFaceCount = g_ptrSelectedFaces.GetSize(); - if ( selected_brushes.next == &selected_brushes && nFaceCount == 0 ) { - return; - } +#include "gtkdlgs.h" +#include - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - { - for ( f = b->brush_faces ; f ; f = f->next ) - { - if ( g_qeglobals.m_bBrushPrimitMode ) { - ShiftTextureRelative_Camera( f, x, y ); - } - else - { - f->texdef.shift[0] += x; - f->texdef.shift[1] += y; - } - } - Brush_Build( b,true,true,false,false ); // don't filter - if ( b->patchBrush ) { - Patch_ShiftTexture( b->pPatch, x, y ); - } - } - if ( nFaceCount > 0 ) { - for ( int i = 0; i < nFaceCount; i++ ) - { - face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( i ) ); - brush_t *selBrush = reinterpret_cast( g_ptrSelectedFaceBrushes.GetAt( i ) ); - if ( g_qeglobals.m_bBrushPrimitMode ) { - ShiftTextureRelative_Camera( selFace, x, y ); - } - else - { - selFace->texdef.shift[0] += x; - selFace->texdef.shift[1] += y; - } - Brush_Build( selBrush,true,true,false,false ); // don't filter - } - } - - Sys_UpdateWindows( W_CAMERA ); +inline Quaternion quaternion_for_euler_xyz_degrees( const Vector3& eulerXYZ ){ +#if 0 + return quaternion_for_matrix4_rotation( matrix4_rotation_for_euler_xyz_degrees( eulerXYZ ) ); +#elif 0 + return quaternion_multiplied_by_quaternion( + quaternion_multiplied_by_quaternion( + quaternion_for_z( degrees_to_radians( eulerXYZ[2] ) ), + quaternion_for_y( degrees_to_radians( eulerXYZ[1] ) ) + ), + quaternion_for_x( degrees_to_radians( eulerXYZ[0] ) ) + ); +#elif 1 + double cx = cos( degrees_to_radians( eulerXYZ[0] * 0.5 ) ); + double sx = sin( degrees_to_radians( eulerXYZ[0] * 0.5 ) ); + double cy = cos( degrees_to_radians( eulerXYZ[1] * 0.5 ) ); + double sy = sin( degrees_to_radians( eulerXYZ[1] * 0.5 ) ); + double cz = cos( degrees_to_radians( eulerXYZ[2] * 0.5 ) ); + double sz = sin( degrees_to_radians( eulerXYZ[2] * 0.5 ) ); + + return Quaternion( + cz * cy * sx - sz * sy * cx, + cz * sy * cx + sz * cy * sx, + sz * cy * cx - cz * sy * sx, + cz * cy * cx + sz * sy * sx + ); +#endif } -// setting float as input -void Select_ScaleTexture( float x, float y ){ - brush_t *b; - face_t *f; +struct RotateDialog +{ + ui::SpinButton x{ui::null}; + ui::SpinButton y{ui::null}; + ui::SpinButton z{ui::null}; + ui::Window window{ui::null}; +}; - int nFaceCount = g_ptrSelectedFaces.GetSize(); +static gboolean rotatedlg_apply( ui::Widget widget, RotateDialog* rotateDialog ){ + Vector3 eulerXYZ; - if ( selected_brushes.next == &selected_brushes && nFaceCount == 0 ) { - return; - } + eulerXYZ[0] = static_cast( gtk_spin_button_get_value( rotateDialog->x ) ); + eulerXYZ[1] = static_cast( gtk_spin_button_get_value( rotateDialog->y ) ); + eulerXYZ[2] = static_cast( gtk_spin_button_get_value( rotateDialog->z ) ); - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - { - for ( f = b->brush_faces ; f ; f = f->next ) - { - if ( g_qeglobals.m_bBrushPrimitMode ) { - // apply same scale as the spinner button of the surface inspector - float shift[2]; - float rotate; - float scale[2]; - brushprimit_texdef_t bp; - // compute normalized texture matrix - ConvertTexMatWithQTexture( &f->brushprimit_texdef, f->d_texture, &bp, NULL ); - // compute fake shift scale rot - TexMatToFakeTexCoords( bp.coords, shift, &rotate, scale ); - // update - scale[0] += static_cast( x ) * 0.1; - scale[1] += static_cast( y ) * 0.1; - // compute new normalized texture matrix - FakeTexCoordsToTexMat( shift, rotate, scale, bp.coords ); - // apply to face texture matrix - ConvertTexMatWithQTexture( &bp, NULL, &f->brushprimit_texdef, f->d_texture ); - } - else - { - f->texdef.scale[0] += x; - f->texdef.scale[1] += y; - } - } - Brush_Build( b,true,true,false,false ); // don't filter - if ( b->patchBrush ) { - Patch_ScaleTexture( b->pPatch, x, y ); - } - } + StringOutputStream command; + command << "rotateSelectedEulerXYZ -x " << eulerXYZ[0] << " -y " << eulerXYZ[1] << " -z " << eulerXYZ[2]; + UndoableCommand undo( command.c_str() ); - if ( nFaceCount > 0 ) { - for ( int i = 0; i < nFaceCount; i++ ) - { - face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( i ) ); - brush_t *selBrush = reinterpret_cast( g_ptrSelectedFaceBrushes.GetAt( i ) ); - if ( g_qeglobals.m_bBrushPrimitMode ) { - float shift[2]; - float rotate; - float scale[2]; - brushprimit_texdef_t bp; - ConvertTexMatWithQTexture( &selFace->brushprimit_texdef, selFace->d_texture, &bp, NULL ); - TexMatToFakeTexCoords( bp.coords, shift, &rotate, scale ); - scale[0] += static_cast( x ) * 0.1; - scale[1] += static_cast( y ) * 0.1; - FakeTexCoordsToTexMat( shift, rotate, scale, bp.coords ); - ConvertTexMatWithQTexture( &bp, NULL, &selFace->brushprimit_texdef, selFace->d_texture ); - } - else - { - selFace->texdef.scale[0] += x; - selFace->texdef.scale[1] += y; - } - Brush_Build( selBrush,true,true,false,false ); // don't filter - } - } - - Sys_UpdateWindows( W_CAMERA ); + GlobalSelectionSystem().rotateSelected( quaternion_for_euler_xyz_degrees( eulerXYZ ) ); + return TRUE; } -void Select_RotateTexture( int amt ){ - brush_t *b; - face_t *f; - - int nFaceCount = g_ptrSelectedFaces.GetSize(); - - if ( selected_brushes.next == &selected_brushes && nFaceCount == 0 ) { - return; - } - - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - { - for ( f = b->brush_faces ; f ; f = f->next ) - { - if ( g_qeglobals.m_bBrushPrimitMode ) { - // apply same scale as the spinner button of the surface inspector - float shift[2]; - float rotate; - float scale[2]; - brushprimit_texdef_t bp; - // compute normalized texture matrix - ConvertTexMatWithQTexture( &f->brushprimit_texdef, f->d_texture, &bp, NULL ); - // compute fake shift scale rot - TexMatToFakeTexCoords( bp.coords, shift, &rotate, scale ); - // update - rotate += amt; - // compute new normalized texture matrix - FakeTexCoordsToTexMat( shift, rotate, scale, bp.coords ); - // apply to face texture matrix - ConvertTexMatWithQTexture( &bp, NULL, &f->brushprimit_texdef, f->d_texture ); - } - else - { - f->texdef.rotate += amt; - f->texdef.rotate = static_cast( f->texdef.rotate ) % 360; - } - } - Brush_Build( b,true,true,false,false ); // don't filter - if ( b->patchBrush ) { - //Patch_RotateTexture(b->nPatchID, amt); - Patch_RotateTexture( b->pPatch, amt ); - } - } +static gboolean rotatedlg_cancel( ui::Widget widget, RotateDialog* rotateDialog ){ + rotateDialog->window.hide(); - if ( nFaceCount > 0 ) { - for ( int i = 0; i < nFaceCount; i++ ) - { - face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( i ) ); - brush_t *selBrush = reinterpret_cast( g_ptrSelectedFaceBrushes.GetAt( i ) ); - if ( g_qeglobals.m_bBrushPrimitMode ) { - float shift[2]; - float rotate; - float scale[2]; - brushprimit_texdef_t bp; - ConvertTexMatWithQTexture( &selFace->brushprimit_texdef, selFace->d_texture, &bp, NULL ); - TexMatToFakeTexCoords( bp.coords, shift, &rotate, scale ); - rotate += amt; - FakeTexCoordsToTexMat( shift, rotate, scale, bp.coords ); - ConvertTexMatWithQTexture( &bp, NULL, &selFace->brushprimit_texdef, selFace->d_texture ); - } - else - { - selFace->texdef.rotate += amt; - selFace->texdef.rotate = static_cast( selFace->texdef.rotate ) % 360; - } - Brush_Build( selBrush,true,true,false,false ); // don't filter - } - } + gtk_spin_button_set_value( rotateDialog->x, 0.0f ); // reset to 0 on close + gtk_spin_button_set_value( rotateDialog->y, 0.0f ); + gtk_spin_button_set_value( rotateDialog->z, 0.0f ); - Sys_UpdateWindows( W_CAMERA ); + return TRUE; } -// TTimo modified to handle shader architecture: -// expects shader names at input, comparison relies on shader names .. texture names no longer relevant -void FindReplaceTextures( const char* pFind, const char* pReplace, bool bSelected, bool bForce, bool bSelectMatchingFaces ){ - if ( strchr( pFind, ' ' ) || strchr( pReplace, ' ' ) ) { - Sys_FPrintf( SYS_WRN, "FindReplaceTextures: '%s' or '%s' have spaces, aborted\n", pFind, pReplace ); - return; - } +static gboolean rotatedlg_ok( ui::Widget widget, RotateDialog* rotateDialog ){ + rotatedlg_apply( widget, rotateDialog ); + rotateDialog->window.hide(); + return TRUE; +} - brush_t* pList = ( bSelected ) ? &selected_brushes : &active_brushes; - if ( !bSelected ) { - Select_Deselect(); - } +static gboolean rotatedlg_delete( ui::Widget widget, GdkEventAny *event, RotateDialog* rotateDialog ){ + rotatedlg_cancel( widget, rotateDialog ); + return TRUE; +} - //++timo BP mode: replacing a texture in BP mode is not that easy, you need to recompute the texture matrix - // if the size of the replacing texture differs, otherwise you get wrong scaling - if ( g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "TODO: finalize find/replace code for brush primitives" ); - } +RotateDialog g_rotate_dialog; +void DoRotateDlg(){ + if ( !g_rotate_dialog.window ) { + g_rotate_dialog.window = MainFrame_getWindow().create_dialog_window("Arbitrary rotation", G_CALLBACK(rotatedlg_delete ), &g_rotate_dialog ); - CPtrArray mFaces; - for ( brush_t* pBrush = pList->next ; pBrush != pList; pBrush = pBrush->next ) - { - if ( !bSelectMatchingFaces && pBrush->patchBrush ) { - Patch_FindReplaceTexture( pBrush, pFind, pReplace, bForce ); - } + auto accel = ui::AccelGroup(ui::New); + g_rotate_dialog.window.add_accel_group( accel ); - bool found = false; //spog - for ( face_t* pFace = pBrush->brush_faces; pFace; pFace = pFace->next ) { - if ( bForce || strcmpi( pFace->pShader->getName(), pFind ) == 0 ) { - if ( !bSelectMatchingFaces ) { - pFace->pShader->DecRef(); - pFace->pShader = QERApp_Shader_ForName( pReplace ); - pFace->pShader->IncRef(); - pFace->d_texture = pFace->pShader->getTexture(); - pFace->texdef.SetName( pReplace ); - found = true; + auto hbox = create_dialog_hbox( 4, 4 ); + g_rotate_dialog.window.add(hbox); + { + auto table = create_dialog_table( 3, 2, 4, 4 ); + hbox.pack_start( table, TRUE, TRUE, 0 ); + { + ui::Widget label = ui::Label( " X " ); + label.show(); + table.attach(label, {0, 1, 0, 1}, {0, 0}); } - else if ( bSelectMatchingFaces ) { - mFaces.Add( pFace ); + { + ui::Widget label = ui::Label( " Y " ); + label.show(); + table.attach(label, {0, 1, 1, 2}, {0, 0}); } - } - } - - if ( found ) { // spog - speed increase, only build brushes that changed - Brush_Build( pBrush ); - } - - } - - if ( bSelectMatchingFaces ) { - if ( bSelected ) { - Select_Deselect(); - } - - int nSize = mFaces.GetSize(); - for ( int i = 0; i < nSize; i++ ) { - g_SelectedFaces.Add( reinterpret_cast( mFaces.GetAt( i ) ) ); - } - } - - Sys_UpdateWindows( W_CAMERA ); -} - -void Select_AllOfType(){ - brush_t *b, *next; - entity_t *e; - // if no brush selected, we will select based on texture - // the first selected face's texture if any, or the current texture - // if a brush is selected, we will select entities (first non-worldspawn owner in selected brushes) - if ( selected_brushes.next == &selected_brushes ) { - - CString strName; - if ( g_ptrSelectedFaces.GetSize() == 0 ) { - strName = g_qeglobals.d_texturewin.texdef.GetName(); - } - else - { - face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( 0 ) ); - strName = selFace->texdef.GetName(); - } - - Sys_Printf( "Selecting all brushes with the texture %s\n", strName.GetBuffer() ); - - Select_Deselect(); - for ( b = active_brushes.next ; b != &active_brushes ; b = next ) - { - next = b->next; + { + ui::Widget label = ui::Label( " Z " ); + label.show(); + table.attach(label, {0, 1, 2, 3}, {0, 0}); + } + { + auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 ); + auto spin = ui::SpinButton( adj, 1, 0 ); + spin.show(); + table.attach(spin, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0}); + spin.dimensions(64, -1); + gtk_spin_button_set_wrap( spin, TRUE ); - if ( b->bFiltered ) { - continue; - } + gtk_widget_grab_focus( spin ); - if ( b->patchBrush ) { - if ( strcmpi( strName, b->pPatch->pShader->getName() ) == 0 ) { - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); + g_rotate_dialog.x = spin; + } + { + auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 ); + auto spin = ui::SpinButton( adj, 1, 0 ); + spin.show(); + table.attach(spin, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0}); + spin.dimensions(64, -1); + gtk_spin_button_set_wrap( spin, TRUE ); + + g_rotate_dialog.y = spin; + } + { + auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 ); + auto spin = ui::SpinButton( adj, 1, 0 ); + spin.show(); + table.attach(spin, {1, 2, 2, 3}, {GTK_EXPAND | GTK_FILL, 0}); + spin.dimensions(64, -1); + gtk_spin_button_set_wrap( spin, TRUE ); + + g_rotate_dialog.z = spin; } } - else { - for ( face_t* pFace = b->brush_faces; pFace; pFace = pFace->next ) + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, TRUE, TRUE, 0 ); { - if ( strcmpi( strName, pFace->texdef.GetName() ) == 0 ) { - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); - } + auto button = create_dialog_button( "OK", G_CALLBACK( rotatedlg_ok ), &g_rotate_dialog ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + widget_make_default( button ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 ); + } + { + auto button = create_dialog_button( "Cancel", G_CALLBACK( rotatedlg_cancel ), &g_rotate_dialog ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 ); + } + { + auto button = create_dialog_button( "Apply", G_CALLBACK( rotatedlg_apply ), &g_rotate_dialog ); + vbox.pack_start( button, FALSE, FALSE, 0 ); } } } - Sys_UpdateWindows( W_ALL ); - return; } + g_rotate_dialog.window.show(); +} - b = selected_brushes.next; - e = b->owner; - if ( e != NULL ) { - if ( e != world_entity ) { - CString strName = e->eclass->name; - CString strKey, strVal; - bool bCriteria = GetSelectAllCriteria( strKey, strVal ); - Sys_Printf( "Selecting all %s entities\n", strName.GetBuffer() ); - Select_Deselect(); - for ( b = active_brushes.next ; b != &active_brushes ; b = next ) - { - next = b->next; - if ( b->bFiltered ) { - continue; - } - - e = b->owner; - if ( e != NULL ) { - if ( strcmpi( e->eclass->name, strName ) == 0 ) { - bool doIt = true; - if ( bCriteria ) { - CString str = ValueForKey( e, strKey ); - if ( str.CompareNoCase( strVal ) != 0 ) { - doIt = false; - } - } - if ( doIt ) { - Brush_RemoveFromList( b ); - Brush_AddToList( b, &selected_brushes ); - } - } - } - } - } - } - Sys_UpdateWindows( W_ALL ); -} -void Select_Reselect(){ - Select_Brush( selected_brushes.next ); - Sys_UpdateWindows( W_ALL ); -} -void Select_FitTexture( int nHeight, int nWidth ){ - brush_t *b; - int nFaceCount = g_ptrSelectedFaces.GetSize(); +struct ScaleDialog +{ + ui::Entry x{ui::null}; + ui::Entry y{ui::null}; + ui::Entry z{ui::null}; + ui::Window window{ui::null}; +}; - if ( selected_brushes.next == &selected_brushes && nFaceCount == 0 ) { - return; - } +static gboolean scaledlg_apply( ui::Widget widget, ScaleDialog* scaleDialog ){ + float sx, sy, sz; - for ( b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) - { - Brush_FitTexture( b, nHeight, nWidth ); - Brush_Build( b,true,true,false,false ); // don't filter - } + sx = static_cast( atof( gtk_entry_get_text( GTK_ENTRY( scaleDialog->x ) ) ) ); + sy = static_cast( atof( gtk_entry_get_text( GTK_ENTRY( scaleDialog->y ) ) ) ); + sz = static_cast( atof( gtk_entry_get_text( GTK_ENTRY( scaleDialog->z ) ) ) ); - if ( nFaceCount > 0 ) { - for ( int i = 0; i < nFaceCount; i++ ) - { - face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( i ) ); - brush_t *selBrush = reinterpret_cast( g_ptrSelectedFaceBrushes.GetAt( i ) ); - Face_FitTexture( selFace, nHeight, nWidth ); - Brush_Build( selBrush,true,true,false,false ); // don't filter - } - } + StringOutputStream command; + command << "scaleSelected -x " << sx << " -y " << sy << " -z " << sz; + UndoableCommand undo( command.c_str() ); - Sys_UpdateWindows( W_CAMERA ); -} + Select_Scale( sx, sy, sz ); -void Select_Hide(){ - for ( brush_t* b = selected_brushes.next ; b && b != &selected_brushes ; b = b->next ) - { - b->hiddenBrush = true; - b->bFiltered = true; - } - Sys_UpdateWindows( W_ALL ); + return TRUE; } -void Select_ShowAllHidden(){ - brush_t* b; - for ( b = selected_brushes.next ; b && b != &selected_brushes ; b = b->next ) - { - if ( b->hiddenBrush ) { - b->hiddenBrush = false; - b->bFiltered = FilterBrush( b ); - } - } - for ( b = active_brushes.next ; b && b != &active_brushes ; b = b->next ) - { - if ( b->hiddenBrush ) { - b->hiddenBrush = false; - b->bFiltered = FilterBrush( b ); - } - } - Sys_UpdateWindows( W_ALL ); -} +static gboolean scaledlg_cancel( ui::Widget widget, ScaleDialog* scaleDialog ){ + scaleDialog->window.hide(); + scaleDialog->x.text("1.0"); + scaleDialog->y.text("1.0"); + scaleDialog->z.text("1.0"); -/* - ============ - Select_Invert - ============ - */ -void Select_Invert( void ){ - brush_t *next, *prev, *b; - - Sys_Printf( "inverting selection...\n" ); - - next = active_brushes.next; - prev = active_brushes.prev; - if ( selected_brushes.next != &selected_brushes ) { - active_brushes.next = selected_brushes.next; - active_brushes.prev = selected_brushes.prev; - active_brushes.next->prev = &active_brushes; - active_brushes.prev->next = &active_brushes; - } - else - { - active_brushes.next = &active_brushes; - active_brushes.prev = &active_brushes; - } - if ( next != &active_brushes ) { - selected_brushes.next = next; - selected_brushes.prev = prev; - selected_brushes.next->prev = &selected_brushes; - selected_brushes.prev->next = &selected_brushes; - } - else - { - selected_brushes.next = &selected_brushes; - selected_brushes.prev = &selected_brushes; - } + return TRUE; +} - // now check if any hidden brush is selected - for ( b = selected_brushes.next; b != &selected_brushes; ) - { - if ( b->patchBrush ) { - b->pPatch->bSelected = true; - } +static gboolean scaledlg_ok( ui::Widget widget, ScaleDialog* scaleDialog ){ + scaledlg_apply( widget, scaleDialog ); + scaleDialog->window.hide(); + return TRUE; +} - if ( b->bFiltered ) { - brush_t *pb = b; - b = b->next; - Brush_RemoveFromList( pb ); - Brush_AddToList( pb, &active_brushes ); - } - else{ b = b->next; } +static gboolean scaledlg_delete( ui::Widget widget, GdkEventAny *event, ScaleDialog* scaleDialog ){ + scaledlg_cancel( widget, scaleDialog ); + return TRUE; +} - } +ScaleDialog g_scale_dialog; - for ( b = active_brushes.next; b != &active_brushes; b = b->next ) - { - if ( b->patchBrush ) { - b->pPatch->bSelected = false; - } - } +void DoScaleDlg(){ + if ( !g_scale_dialog.window ) { + g_scale_dialog.window = MainFrame_getWindow().create_dialog_window("Arbitrary scale", G_CALLBACK(scaledlg_delete ), &g_scale_dialog ); - // since invert selection only works at the brush level, - // set g_qeglobals.d_select_mode accordingly - g_qeglobals.d_select_mode = sel_brush; + auto accel = ui::AccelGroup(ui::New); + g_scale_dialog.window.add_accel_group( accel ); - // since invert selection only works at the brush level, - // set g_qeglobals.d_select_mode accordingly - g_qeglobals.d_select_mode = sel_brush; + { + auto hbox = create_dialog_hbox( 4, 4 ); + g_scale_dialog.window.add(hbox); + { + auto table = create_dialog_table( 3, 2, 4, 4 ); + hbox.pack_start( table, TRUE, TRUE, 0 ); + { + ui::Widget label = ui::Label( " X " ); + label.show(); + table.attach(label, {0, 1, 0, 1}, {0, 0}); + } + { + ui::Widget label = ui::Label( " Y " ); + label.show(); + table.attach(label, {0, 1, 1, 2}, {0, 0}); + } + { + ui::Widget label = ui::Label( " Z " ); + label.show(); + table.attach(label, {0, 1, 2, 3}, {0, 0}); + } + { + auto entry = ui::Entry(ui::New); + entry.text("1.0"); + entry.show(); + table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0}); - Sys_UpdateWindows( W_ALL ); + g_scale_dialog.x = entry; + } + { + auto entry = ui::Entry(ui::New); + entry.text("1.0"); + entry.show(); + table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0}); - Sys_Printf( "done.\n" ); -} + g_scale_dialog.y = entry; + } + { + auto entry = ui::Entry(ui::New); + entry.text("1.0"); + entry.show(); + table.attach(entry, {1, 2, 2, 3}, {GTK_EXPAND | GTK_FILL, 0}); -#ifdef ENABLE_GROUPS -/* - =========== - Select_Name - =========== - */ -void Select_Name( const char *pName ){ - if ( g_qeglobals.m_bBrushPrimitMode ) { - for ( brush_t* b = selected_brushes.next ; b && b != &selected_brushes ; b = b->next ) - { - Brush_SetEpair( b, "Name", pName ); + g_scale_dialog.z = entry; + } + } + { + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, TRUE, TRUE, 0 ); + { + auto button = create_dialog_button( "OK", G_CALLBACK( scaledlg_ok ), &g_scale_dialog ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + widget_make_default( button ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 ); + } + { + auto button = create_dialog_button( "Cancel", G_CALLBACK( scaledlg_cancel ), &g_scale_dialog ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 ); + } + { + auto button = create_dialog_button( "Apply", G_CALLBACK( scaledlg_apply ), &g_scale_dialog ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + } + } } } -} -/* - ================= - Select_AddToGroup - add selected brushes to a group, update the tree - ================= - */ -void Select_AddToGroup( const char *pName ){ - if ( g_qeglobals.m_bBrushPrimitMode ) { - for ( brush_t* b = selected_brushes.next ; b && b != &selected_brushes ; b = b->next ) - { - Brush_SetEpair( b, "group", pName ); - Group_AddToProperGroup( b ); - } - } + g_scale_dialog.window.show(); } -#endif