From a3e673302cbd1184a7fc86ac6ea28ac08a4e5889 Mon Sep 17 00:00:00 2001 From: Garux Date: Wed, 29 Jan 2025 23:44:11 +0500 Subject: [PATCH] * Misc->Colors: add CameraIcon, AxisX, AxisY, AxisZ controls --- docs/changelog-custom.txt | 1 + libs/pivot.h | 36 +++++---------- libs/render.h | 7 +++ radiant/camwindow.cpp | 6 +-- radiant/colors.cpp | 17 +++++++ radiant/xywindow.cpp | 46 ++++++++++++------- radiant/xywindow.h | 4 +- .../tools/themes/_colors/Adwaita Dark.json | 28 ++++++----- .../tools/themes/_colors/Black and Green.json | 28 ++++++----- .../tools/themes/_colors/Blender Dark.json | 30 ++++++------ .../tools/themes/_colors/Blender Lighter.json | 28 ++++++----- setup/data/tools/themes/_colors/Green.json | 28 ++++++----- .../_colors/Maya.Max.Lightwave Emulation.json | 28 ++++++----- .../themes/_colors/Q3Radiant Original.json | 28 ++++++----- .../tools/themes/_colors/QE4 Original.json | 28 ++++++----- 15 files changed, 200 insertions(+), 143 deletions(-) diff --git a/docs/changelog-custom.txt b/docs/changelog-custom.txt index 7860f1cc..e8063e3a 100644 --- a/docs/changelog-custom.txt +++ b/docs/changelog-custom.txt @@ -359,6 +359,7 @@ menus... * Misc->Colors display colors * Misc->Colors->Viewports Theme: load from .json presets stored in install/themes/_colors/ * add Blender Lighter and Green viewports themes by Julius + * Misc->Colors: add CameraIcon, AxisX, AxisY, AxisZ controls misc... * removed note to save before going to preferences, project settings diff --git a/libs/pivot.h b/libs/pivot.h index f3a88335..1090a5b4 100644 --- a/libs/pivot.h +++ b/libs/pivot.h @@ -223,15 +223,11 @@ inline void Pivot2World_viewplaneSpace( Matrix4& manip2world, const Matrix4& piv #include "cullable.h" #include "render.h" -const Colour4b g_colour_x( 255, 0, 0, 255 ); -const Colour4b g_colour_y( 0, 255, 0, 255 ); -const Colour4b g_colour_z( 0, 0, 255, 255 ); - class Shader; class RenderablePivot : public OpenGLRenderable { - VertexBuffer m_vertices; + const PointVertex m_vertices[6]; public: mutable Matrix4 m_localToWorld; typedef Static StaticShader; @@ -239,29 +235,21 @@ public: return StaticShader::instance(); } - RenderablePivot( std::size_t size = 16 ){ - m_vertices.reserve( 6 ); + RenderablePivot( std::size_t size = 16 ) : m_vertices{ + PointVertex( Vertex3f( 0, 0, 0 ), g_colour_x ), + PointVertex( Vertex3f( size, 0, 0 ), g_colour_x ), - m_vertices.push_back( PointVertex( Vertex3f( 0, 0, 0 ), g_colour_x ) ); - m_vertices.push_back( PointVertex( Vertex3f( size, 0, 0 ), g_colour_x ) ); + PointVertex( Vertex3f( 0, 0, 0 ), g_colour_y ), + PointVertex( Vertex3f( 0, size, 0 ), g_colour_y ), - m_vertices.push_back( PointVertex( Vertex3f( 0, 0, 0 ), g_colour_y ) ); - m_vertices.push_back( PointVertex( Vertex3f( 0, size, 0 ), g_colour_y ) ); - - m_vertices.push_back( PointVertex( Vertex3f( 0, 0, 0 ), g_colour_z ) ); - m_vertices.push_back( PointVertex( Vertex3f( 0, 0, size ), g_colour_z ) ); - } + PointVertex( Vertex3f( 0, 0, 0 ), g_colour_z ), + PointVertex( Vertex3f( 0, 0, size ), g_colour_z ), + }{} void render( RenderStateFlags state ) const { - if ( m_vertices.size() == 0 ) { - return; - } - if ( m_vertices.data() == 0 ) { - return; - } - gl().glVertexPointer( 3, GL_FLOAT, sizeof( PointVertex ), &m_vertices.data()->vertex ); - gl().glColorPointer( 4, GL_UNSIGNED_BYTE, sizeof( PointVertex ), &m_vertices.data()->colour ); - gl().glDrawArrays( GL_LINES, 0, m_vertices.size() ); + gl().glVertexPointer( 3, GL_FLOAT, sizeof( PointVertex ), &m_vertices->vertex ); + gl().glColorPointer( 4, GL_UNSIGNED_BYTE, sizeof( PointVertex ), &m_vertices->colour ); + gl().glDrawArrays( GL_LINES, 0, std::size( m_vertices ) ); } void render( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld ) const { diff --git a/libs/render.h b/libs/render.h index 03383886..624a01a0 100644 --- a/libs/render.h +++ b/libs/render.h @@ -285,6 +285,13 @@ struct Colour4b } }; +/* note: controlling these via preference system does not affect +RenderablePivot in entity module (separate module) and +RenderablePivot in UVManipulator (initialized earlier) */ +inline Colour4b g_colour_x( 255, 0, 0, 255 ); +inline Colour4b g_colour_y( 0, 255, 0, 255 ); +inline Colour4b g_colour_z( 0, 0, 255, 255 ); + const Colour4b colour_vertex( 0, 255, 0, 255 ); const Colour4b colour_occluded( 74, 150, 75, 255 ); const Colour4b colour_selected( 0, 0, 255, 255 ); diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 83eaccda..290a3e3e 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -798,11 +798,11 @@ private: switch ( i ) { case 0: - return g_xywindow_globals.AxisColorX; + return Vector3( g_colour_x.r, g_colour_x.g, g_colour_x.b ) / 255.f; case 1: - return g_xywindow_globals.AxisColorY; + return Vector3( g_colour_y.r, g_colour_y.g, g_colour_y.b ) / 255.f; default: - return Vector3( g_xywindow_globals.AxisColorZ.x(), 0.7f, g_xywindow_globals.AxisColorZ.z() ); //hack to make default blue visible better + return Vector3( g_colour_z.r, 178, g_colour_z.b ) / 255.f; //hack to make default blue visible better } } void updateTex( const std::size_t i, const float extent ){ diff --git a/radiant/colors.cpp b/radiant/colors.cpp index 2336fb93..02c8037f 100644 --- a/radiant/colors.cpp +++ b/radiant/colors.cpp @@ -28,6 +28,7 @@ #include "xywindow.h" #include "camwindow.h" #include "texwindow.h" +#include "render.h" #include "mainframe.h" #include "brushmodule.h" #include "preferences.h" @@ -109,6 +110,18 @@ void Colour_set( Vector3& colour, const Vector3& other ){ } typedef ReferenceCaller ColourSetCaller; + +Vector3 Colour4b_get( const Colour4b& colour ){ + return Vector3( colour.r, colour.g, colour.b ) / 255.f; +} +typedef ConstReferenceCaller Colour4bGetCaller; + +void Colour4b_set( Colour4b& colour, const Vector3& other ){ + colour = Colour4b( other[0] * 255.f, other[1] * 255.f, other[2] * 255.f, colour.a ); +} +typedef ReferenceCaller Colour4bSetCaller; + + void BrushColour_set( const Vector3& other ){ SetWorldspawnColour( g_xywindow_globals.color_brushes = other ); } @@ -146,6 +159,10 @@ std::array g_ColoursMenu{ ChooseColour( ColourGetCaller( g_camwindow_globals.color_selbrushes3d ), makeCallbackF( SelectedBrush3dColour_set ) , "Selected Brush (Camera)..." , "SI_Colors12" ), ChooseColour( ColourGetCaller( g_xywindow_globals.color_clipper ) , makeCallbackF( ClipperColour_set ) , "Clipper..." , "SI_Colors10" ), ChooseColour( ColourGetCaller( g_xywindow_globals.color_viewname ) , ColourSetCaller( g_xywindow_globals.color_viewname ) , "Active View Name and Outline..." , "SI_Colors9" ), + ChooseColour( ColourGetCaller( g_xywindow_globals.color_camera ) , ColourSetCaller( g_xywindow_globals.color_camera ) , "Camera Icon..." , "ColorCameraIcon" ), + ChooseColour( Colour4bGetCaller( g_colour_x ) , Colour4bSetCaller( g_colour_x ) , "Axis X..." , "ColorsAxisX" ), + ChooseColour( Colour4bGetCaller( g_colour_y ) , Colour4bSetCaller( g_colour_y ) , "Axis Y..." , "ColorsAxisY" ), + ChooseColour( Colour4bGetCaller( g_colour_z ) , Colour4bSetCaller( g_colour_z ) , "Axis Z..." , "ColorsAxisZ" ), }; static void load_colors_theme( const char *filepath ){ diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index efa4bbe0..0226808b 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -380,11 +380,11 @@ void XYWnd::overlayDraw(){ gl().glLoadIdentity(); // four view mode doesn't colorize - gl().glColor3fv( vector3_to_array( ( g_pParentWnd->CurrentStyle() == MainFrame::eSplit )? - g_xywindow_globals.color_viewname - : m_viewType == YZ? g_xywindow_globals.AxisColorX - : m_viewType == XZ? g_xywindow_globals.AxisColorY - : g_xywindow_globals.AxisColorZ ) ); + ( g_pParentWnd->CurrentStyle() == MainFrame::eSplit ) + ? gl().glColor3fv( vector3_to_array( g_xywindow_globals.color_viewname ) ) + : gl().glColor3ubv( m_viewType == YZ? &g_colour_x.r + : m_viewType == XZ? &g_colour_y.r + : &g_colour_z.r ); gl().glBegin( GL_LINE_LOOP ); gl().glVertex2f( 0.5, 0.5 ); gl().glVertex2f( m_nWidth - 0.5, 0.5 ); @@ -1247,8 +1247,8 @@ void XYWnd::XY_DrawAxis(){ const float w = ( m_nWidth / 2 / m_fScale ); const float h = ( m_nHeight / 2 / m_fScale ); - Vector3 colourX = ( m_viewType == YZ ) ? g_xywindow_globals.AxisColorY : g_xywindow_globals.AxisColorX; - Vector3 colourY = ( m_viewType == XY ) ? g_xywindow_globals.AxisColorY : g_xywindow_globals.AxisColorZ; + const Colour4b colourX = ( m_viewType == YZ ) ? g_colour_y : g_colour_x; + const Colour4b colourY = ( m_viewType == XY ) ? g_colour_y : g_colour_z; #if 0 //gray for nonActive if( !Active() ){ float grayX = vector3_dot( colourX, Vector3( 0.2989, 0.5870, 0.1140 ) ); @@ -1261,12 +1261,12 @@ void XYWnd::XY_DrawAxis(){ // horizontal line: nDim1 color gl().glLineWidth( 2 ); gl().glBegin( GL_LINES ); - gl().glColor3fv( vector3_to_array( colourX ) ); + gl().glColor3ubv( &colourX.r ); gl().glVertex2f( m_vOrigin[nDim1] - w + 40 / m_fScale, m_vOrigin[nDim2] + h - 45 / m_fScale ); gl().glVertex2f( m_vOrigin[nDim1] - w + 65 / m_fScale, m_vOrigin[nDim2] + h - 45 / m_fScale ); gl().glVertex2f( 0, 0 ); gl().glVertex2f( 32 / m_fScale, 0 ); - gl().glColor3fv( vector3_to_array( colourY ) ); + gl().glColor3ubv( &colourY.r ); gl().glVertex2f( m_vOrigin[nDim1] - w + 40 / m_fScale, m_vOrigin[nDim2] + h - 45 / m_fScale ); gl().glVertex2f( m_vOrigin[nDim1] - w + 40 / m_fScale, m_vOrigin[nDim2] + h - 20 / m_fScale ); gl().glVertex2f( 0, 0 ); @@ -1276,12 +1276,12 @@ void XYWnd::XY_DrawAxis(){ // now print axis symbols const int fontHeight = GlobalOpenGL().m_font->getPixelHeight(); const float fontWidth = fontHeight * .55f; - gl().glColor3fv( vector3_to_array( colourX ) ); + gl().glColor3ubv( &colourX.r ); gl().glRasterPos2f( m_vOrigin[nDim1] - w + ( 65 - 3 - fontWidth ) / m_fScale, m_vOrigin[nDim2] + h - ( 45 + 3 + fontHeight ) / m_fScale ); GlobalOpenGL().drawChar( g_AxisName[nDim1] ); gl().glRasterPos2f( ( 32 - fontWidth / 2 ) / m_fScale, -( 0 + 3 + fontHeight ) / m_fScale ); GlobalOpenGL().drawChar( g_AxisName[nDim1] ); - gl().glColor3fv( vector3_to_array( colourY ) ); + gl().glColor3ubv( &colourY.r ); gl().glRasterPos2f( m_vOrigin[nDim1] - w + ( 40 - 4 - fontWidth ) / m_fScale, m_vOrigin[nDim2] + h - ( 20 + 3 + fontHeight ) / m_fScale ); GlobalOpenGL().drawChar( g_AxisName[nDim2] ); gl().glRasterPos2f( ( 0 - 3 - fontWidth ) / m_fScale, ( 32 - fontHeight / 2 ) / m_fScale ); @@ -1583,7 +1583,7 @@ void XYWnd::DrawCameraIcon( const Vector3& origin, const Vector3& angles ){ degrees_to_radians( ( angles[CAMERA_YAW] > 180 ) ? ( 180.0f - angles[CAMERA_PITCH] ) : angles[CAMERA_PITCH] ) : degrees_to_radians( ( angles[CAMERA_YAW] < 270 && angles[CAMERA_YAW] > 90 ) ? ( 180.0f - angles[CAMERA_PITCH] ) : angles[CAMERA_PITCH] ); - gl().glColor3f( 0.0, 0.0, 1.0 ); + gl().glColor3fv( vector3_to_array( g_xywindow_globals.color_camera ) ); gl().glBegin( GL_LINE_STRIP ); gl().glVertex3f( x - box,y,0 ); gl().glVertex3f( x,y + ( box / 2 ),0 ); @@ -1598,7 +1598,6 @@ void XYWnd::DrawCameraIcon( const Vector3& origin, const Vector3& angles ){ gl().glVertex3f( x, y, 0 ); gl().glVertex3f( x + static_cast( fov * cos( a - c_pi / 4 ) ), y + static_cast( fov * sin( a - c_pi / 4 ) ), 0 ); gl().glEnd(); - } @@ -2217,6 +2216,20 @@ void MSAAExport( const IntImportCallback& importer ){ typedef FreeCaller MSAAExportCaller; +inline void Colour4b_importString( Colour4b& self, const char* string ){ + if ( 4 != sscanf( string, "%hhu %hhu %hhu %hhu", &self.r, &self.g, &self.b, &self.a ) ) { + self = Colour4b( 0, 0, 0, 255 ); + } +} +typedef ReferenceCaller Colour4bImportStringCaller; +inline void Colour4b_exportString( const Colour4b& self, const StringImportCallback& importer ){ + char buffer[64]; + sprintf( buffer, "%hhu %hhu %hhu %hhu", self.r, self.g, self.b, self.a ); + importer( buffer ); +} +typedef ConstReferenceCaller Colour4bExportStringCaller; + + void XYShow_registerCommands(){ GlobalToggles_insert( "ShowSize2d", makeCallbackF( ToggleShowSizeInfo ), ToggleItem::AddCallbackCaller( g_show_size_item ), QKeySequence( "J" ) ); GlobalToggles_insert( "ToggleCrosshairs", makeCallbackF( ToggleShowCrosshair ), ToggleItem::AddCallbackCaller( g_show_crosshair_item ), QKeySequence( "Shift+X" ) ); @@ -2295,9 +2308,9 @@ void XYWindow_Construct(){ GlobalPreferenceSystem().registerPreference( "SI_ShowAxis", BoolImportStringCaller( g_xywindow_globals_private.show_axis ), BoolExportStringCaller( g_xywindow_globals_private.show_axis ) ); GlobalPreferenceSystem().registerPreference( "ShowWorkzone2d", BoolImportStringCaller( g_xywindow_globals_private.show_workzone ), BoolExportStringCaller( g_xywindow_globals_private.show_workzone ) ); - GlobalPreferenceSystem().registerPreference( "SI_AxisColors0", Vector3ImportStringCaller( g_xywindow_globals.AxisColorX ), Vector3ExportStringCaller( g_xywindow_globals.AxisColorX ) ); - GlobalPreferenceSystem().registerPreference( "SI_AxisColors1", Vector3ImportStringCaller( g_xywindow_globals.AxisColorY ), Vector3ExportStringCaller( g_xywindow_globals.AxisColorY ) ); - GlobalPreferenceSystem().registerPreference( "SI_AxisColors2", Vector3ImportStringCaller( g_xywindow_globals.AxisColorZ ), Vector3ExportStringCaller( g_xywindow_globals.AxisColorZ ) ); + GlobalPreferenceSystem().registerPreference( "ColorsAxisX", Colour4bImportStringCaller( g_colour_x ),Colour4bExportStringCaller( g_colour_x ) ); + GlobalPreferenceSystem().registerPreference( "ColorsAxisY", Colour4bImportStringCaller( g_colour_y ),Colour4bExportStringCaller( g_colour_y ) ); + GlobalPreferenceSystem().registerPreference( "ColorsAxisZ", Colour4bImportStringCaller( g_colour_z ),Colour4bExportStringCaller( g_colour_z ) ); GlobalPreferenceSystem().registerPreference( "SI_Colors1", Vector3ImportStringCaller( g_xywindow_globals.color_gridback ), Vector3ExportStringCaller( g_xywindow_globals.color_gridback ) ); GlobalPreferenceSystem().registerPreference( "SI_Colors2", Vector3ImportStringCaller( g_xywindow_globals.color_gridminor ), Vector3ExportStringCaller( g_xywindow_globals.color_gridminor ) ); GlobalPreferenceSystem().registerPreference( "SI_Colors3", Vector3ImportStringCaller( g_xywindow_globals.color_gridmajor ), Vector3ExportStringCaller( g_xywindow_globals.color_gridmajor ) ); @@ -2307,6 +2320,7 @@ void XYWindow_Construct(){ GlobalPreferenceSystem().registerPreference( "SI_Colors9", Vector3ImportStringCaller( g_xywindow_globals.color_viewname ), Vector3ExportStringCaller( g_xywindow_globals.color_viewname ) ); GlobalPreferenceSystem().registerPreference( "SI_Colors10", Vector3ImportStringCaller( g_xywindow_globals.color_clipper ), Vector3ExportStringCaller( g_xywindow_globals.color_clipper ) ); GlobalPreferenceSystem().registerPreference( "SI_Colors11", Vector3ImportStringCaller( g_xywindow_globals.color_selbrushes ), Vector3ExportStringCaller( g_xywindow_globals.color_selbrushes ) ); + GlobalPreferenceSystem().registerPreference( "ColorCameraIcon", Vector3ImportStringCaller( g_xywindow_globals.color_camera ), Vector3ExportStringCaller( g_xywindow_globals.color_camera ) ); GlobalPreferenceSystem().registerPreference( "XYVIS", makeBoolStringImportCallback( ToggleShownImportBoolCaller( g_xy_top_shown ) ), makeBoolStringExportCallback( ToggleShownExportBoolCaller( g_xy_top_shown ) ) ); diff --git a/radiant/xywindow.h b/radiant/xywindow.h index 64700110..905f29d4 100644 --- a/radiant/xywindow.h +++ b/radiant/xywindow.h @@ -258,9 +258,7 @@ struct xywindow_globals_t Vector3 color_selbrushes = { 1.0f, 0.627451f, 0.0f }; Vector3 color_clipper = { 0.0f, 0.0f, 1.0f }; Vector3 color_viewname = { 0.516136f, 0.516136f, 0.516136f }; - Vector3 AxisColorX = { 1.f, 0.f, 0.f }; - Vector3 AxisColorY = { 0.f, 1.f, 0.f }; - Vector3 AxisColorZ = { 0.f, 0.f, 1.f }; + Vector3 color_camera = { 0.0, 0.0, 1.0 }; bool m_bNoStipple = true; }; diff --git a/setup/data/tools/themes/_colors/Adwaita Dark.json b/setup/data/tools/themes/_colors/Adwaita Dark.json index e449a0cf..7d3fc452 100644 --- a/setup/data/tools/themes/_colors/Adwaita Dark.json +++ b/setup/data/tools/themes/_colors/Adwaita Dark.json @@ -1,15 +1,19 @@ /* color scheme to fit the GTK Adwaita Dark theme */ { -/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], -/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], -/* GridBackground */ "SI_Colors1" : [0.25, 0.25, 0.25], -/* GridMajor */ "SI_Colors3" : [0.14, 0.15, 0.15], -/* GridMinor */ "SI_Colors2" : [0.21, 0.23, 0.23], -/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], -/* GridBlock */ "SI_Colors6" : [1.0, 1.0, 1.0], -/* Brush */ "SI_Colors8" : [0.73, 0.73, 0.73], -/* SelectedBrush */ "SI_Colors11": [1.0, 0.0, 0.0], -/* CameraSelectedBrush */ "SI_Colors12": [1.0, 0.0, 0.0], -/* Clipper */ "SI_Colors10": [0.0, 0.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], +/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], +/* GridBackground */ "SI_Colors1" : [0.25, 0.25, 0.25], +/* GridMajor */ "SI_Colors3" : [0.14, 0.15, 0.15], +/* GridMinor */ "SI_Colors2" : [0.21, 0.23, 0.23], +/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], +/* GridBlock */ "SI_Colors6" : [1.0, 1.0, 1.0], +/* Brush */ "SI_Colors8" : [0.73, 0.73, 0.73], +/* SelectedBrush */ "SI_Colors11" : [1.0, 0.0, 0.0], +/* CameraSelectedBrush */ "SI_Colors12" : [1.0, 0.0, 0.0], +/* Clipper */ "SI_Colors10" : [0.0, 0.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* CameraIcon */ "ColorCameraIcon" : [0.0, 0.0, 1.0], +/* Axis X */ "ColorsAxisX" : [1.0, 0.0, 0.0], +/* Axis Y */ "ColorsAxisY" : [0.0, 1.0, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.0, 0.0, 1.0], } diff --git a/setup/data/tools/themes/_colors/Black and Green.json b/setup/data/tools/themes/_colors/Black and Green.json index bd48989b..f90c7c2c 100644 --- a/setup/data/tools/themes/_colors/Black and Green.json +++ b/setup/data/tools/themes/_colors/Black and Green.json @@ -1,14 +1,18 @@ { -/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], -/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], -/* GridBackground */ "SI_Colors1" : [0.0, 0.0, 0.0], -/* GridMajor */ "SI_Colors3" : [0.3, 0.5, 0.5], -/* GridMinor */ "SI_Colors2" : [0.2, 0.2, 0.2], -/* GridText */ "SI_Colors7" : [1.0, 1.0, 1.0], -/* GridBlock */ "SI_Colors6" : [0.0, 0.0, 1.0], -/* Brush */ "SI_Colors8" : [1.0, 1.0, 1.0], -/* SelectedBrush */ "SI_Colors11": [1.0, 0.0, 0.0], -/* CameraSelectedBrush */ "SI_Colors12": [1.0, 0.0, 0.0], -/* Clipper */ "SI_Colors10": [0.0, 0.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.7, 0.7, 0.0], +/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], +/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], +/* GridBackground */ "SI_Colors1" : [0.0, 0.0, 0.0], +/* GridMajor */ "SI_Colors3" : [0.3, 0.5, 0.5], +/* GridMinor */ "SI_Colors2" : [0.2, 0.2, 0.2], +/* GridText */ "SI_Colors7" : [1.0, 1.0, 1.0], +/* GridBlock */ "SI_Colors6" : [0.0, 0.0, 1.0], +/* Brush */ "SI_Colors8" : [1.0, 1.0, 1.0], +/* SelectedBrush */ "SI_Colors11" : [1.0, 0.0, 0.0], +/* CameraSelectedBrush */ "SI_Colors12" : [1.0, 0.0, 0.0], +/* Clipper */ "SI_Colors10" : [0.0, 0.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.7, 0.7, 0.0], +/* CameraIcon */ "ColorCameraIcon" : [0.0, 0.0, 1.0], +/* Axis X */ "ColorsAxisX" : [1.0, 0.0, 0.0], +/* Axis Y */ "ColorsAxisY" : [0.0, 1.0, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.0, 0.0, 1.0], } diff --git a/setup/data/tools/themes/_colors/Blender Dark.json b/setup/data/tools/themes/_colors/Blender Dark.json index ce8444b7..d11f4075 100644 --- a/setup/data/tools/themes/_colors/Blender Dark.json +++ b/setup/data/tools/themes/_colors/Blender Dark.json @@ -1,14 +1,18 @@ { -/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], -/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], -/* GridBackground */ "SI_Colors1" : [0.225803, 0.225803, 0.225803], -/* GridMajor */ "SI_Colors3" : [0.301960, 0.301960, 0.301960], -/* GridMinor */ "SI_Colors2" : [0.254902, 0.254902, 0.254902], -/* GridText */ "SI_Colors7" : [0.972549, 0.972549, 0.972549], -/* GridBlock */ "SI_Colors6" : [1.0, 1.0, 1.0], -/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], -/* SelectedBrush */ "SI_Colors11": [1.0, 0.627451, 0.0], -/* CameraSelectedBrush */ "SI_Colors12": [1.0, 0.627451, 0.0], -/* Clipper */ "SI_Colors10": [0.0, 0.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.516136, 0.516136, 0.516136], -} \ No newline at end of file +/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], +/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], +/* GridBackground */ "SI_Colors1" : [0.225803, 0.225803, 0.225803], +/* GridMajor */ "SI_Colors3" : [0.301960, 0.301960, 0.301960], +/* GridMinor */ "SI_Colors2" : [0.254902, 0.254902, 0.254902], +/* GridText */ "SI_Colors7" : [0.972549, 0.972549, 0.972549], +/* GridBlock */ "SI_Colors6" : [1.0, 1.0, 1.0], +/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], +/* SelectedBrush */ "SI_Colors11" : [1.0, 0.627451, 0.0], +/* CameraSelectedBrush */ "SI_Colors12" : [1.0, 0.627451, 0.0], +/* Clipper */ "SI_Colors10" : [0.0, 0.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.516136, 0.516136, 0.516136], +/* CameraIcon */ "ColorCameraIcon" : [0.0, 0.0, 1.0], +/* Axis X */ "ColorsAxisX" : [1.0, 0.0, 0.0], +/* Axis Y */ "ColorsAxisY" : [0.0, 1.0, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.0, 0.0, 1.0], +} diff --git a/setup/data/tools/themes/_colors/Blender Lighter.json b/setup/data/tools/themes/_colors/Blender Lighter.json index eeeea6cd..cd324fcb 100644 --- a/setup/data/tools/themes/_colors/Blender Lighter.json +++ b/setup/data/tools/themes/_colors/Blender Lighter.json @@ -1,15 +1,19 @@ /* Blender2 Color Scheme: LIGHTER background, BLACK grid & WHITE brushes */ { -/* TextureBackground */ "SI_Colors0" : [0.239215, 0.239215, 0.239215], -/* CameraBackground */ "SI_Colors4" : [0.239215, 0.239215, 0.239215], -/* GridBackground */ "SI_Colors1" : [0.290196, 0.290196, 0.290196], -/* GridMajor */ "SI_Colors3" : [0.156862, 0.156862, 0.156862], -/* GridMinor */ "SI_Colors2" : [0.239215, 0.239215, 0.239215], -/* GridText */ "SI_Colors7" : [0.721568, 0.721568, 0.721568], -/* GridBlock */ "SI_Colors6" : [0.250980, 0.501960, 1.0], -/* Brush */ "SI_Colors8" : [0.843137, 0.843137, 0.843137], -/* SelectedBrush */ "SI_Colors11": [1.0, 0.627450, 0.156862], -/* CameraSelectedBrush */ "SI_Colors12": [1.0, 0.627450, 0.156862], -/* Clipper */ "SI_Colors10": [0.501960, 1.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.721568, 0.721568, 0.721568], +/* TextureBackground */ "SI_Colors0" : [0.239215, 0.239215, 0.239215], +/* CameraBackground */ "SI_Colors4" : [0.239215, 0.239215, 0.239215], +/* GridBackground */ "SI_Colors1" : [0.290196, 0.290196, 0.290196], +/* GridMajor */ "SI_Colors3" : [0.156862, 0.156862, 0.156862], +/* GridMinor */ "SI_Colors2" : [0.239215, 0.239215, 0.239215], +/* GridText */ "SI_Colors7" : [0.721568, 0.721568, 0.721568], +/* GridBlock */ "SI_Colors6" : [0.250980, 0.501960, 1.0], +/* Brush */ "SI_Colors8" : [0.843137, 0.843137, 0.843137], +/* SelectedBrush */ "SI_Colors11" : [1.0, 0.627450, 0.156862], +/* CameraSelectedBrush */ "SI_Colors12" : [1.0, 0.627450, 0.156862], +/* Clipper */ "SI_Colors10" : [0.501960, 1.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.721568, 0.721568, 0.721568], +/* CameraIcon */ "ColorCameraIcon" : [0.960784, 0.945098, 0.301960], +/* Axis X */ "ColorsAxisX" : [1.0, 0.2, 0.321568], +/* Axis Y */ "ColorsAxisY" : [0.545098, 0.862745, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.156862, 0.564705, 1.0], } diff --git a/setup/data/tools/themes/_colors/Green.json b/setup/data/tools/themes/_colors/Green.json index 3c33ebc5..18bcc9cc 100644 --- a/setup/data/tools/themes/_colors/Green.json +++ b/setup/data/tools/themes/_colors/Green.json @@ -1,15 +1,19 @@ /* Green Color Scheme: GREEN background, GREEN grid & WHITE brushes */ { -/* TextureBackground */ "SI_Colors0" : [0.239215, 0.239215, 0.239215], -/* CameraBackground */ "SI_Colors4" : [0.239215, 0.239215, 0.239215], -/* GridBackground */ "SI_Colors1" : [0.094117, 0.317647, 0.274509], -/* GridMajor */ "SI_Colors3" : [0.223529, 0.450980, 0.407843], -/* GridMinor */ "SI_Colors2" : [0.145098, 0.360784, 0.317647], -/* GridText */ "SI_Colors7" : [0.223529, 0.749019, 0.647058], -/* GridBlock */ "SI_Colors6" : [0.250980, 0.564705, 1.0], -/* Brush */ "SI_Colors8" : [0.901960, 0.901960, 0.901960], -/* SelectedBrush */ "SI_Colors11": [0.298039, 1.0, 0.862745], -/* CameraSelectedBrush */ "SI_Colors12": [0.501960, 1.0, 0.901960], -/* Clipper */ "SI_Colors10": [0.501960, 1.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.486274, 0.749019, 0.698039], +/* TextureBackground */ "SI_Colors0" : [0.239215, 0.239215, 0.239215], +/* CameraBackground */ "SI_Colors4" : [0.239215, 0.239215, 0.239215], +/* GridBackground */ "SI_Colors1" : [0.094117, 0.317647, 0.274509], +/* GridMajor */ "SI_Colors3" : [0.223529, 0.450980, 0.407843], +/* GridMinor */ "SI_Colors2" : [0.145098, 0.360784, 0.317647], +/* GridText */ "SI_Colors7" : [0.223529, 0.749019, 0.647058], +/* GridBlock */ "SI_Colors6" : [0.250980, 0.564705, 1.0], +/* Brush */ "SI_Colors8" : [0.901960, 0.901960, 0.901960], +/* SelectedBrush */ "SI_Colors11" : [0.298039, 1.0, 0.862745], +/* CameraSelectedBrush */ "SI_Colors12" : [0.501960, 1.0, 0.901960], +/* Clipper */ "SI_Colors10" : [0.501960, 1.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.486274, 0.749019, 0.698039], +/* CameraIcon */ "ColorCameraIcon" : [0.960784, 0.945098, 0.301960], +/* Axis X */ "ColorsAxisX" : [1.0, 0.2, 0.321568], +/* Axis Y */ "ColorsAxisY" : [0.545098, 0.862745, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.156862, 0.564705, 1.0], } diff --git a/setup/data/tools/themes/_colors/Maya.Max.Lightwave Emulation.json b/setup/data/tools/themes/_colors/Maya.Max.Lightwave Emulation.json index 665e3aef..48cfe969 100644 --- a/setup/data/tools/themes/_colors/Maya.Max.Lightwave Emulation.json +++ b/setup/data/tools/themes/_colors/Maya.Max.Lightwave Emulation.json @@ -1,15 +1,19 @@ /* ydnar: to emulate maya/max/lightwave color schemes */ { -/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], -/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], -/* GridBackground */ "SI_Colors1" : [0.77, 0.77, 0.77], -/* GridMajor */ "SI_Colors3" : [0.89, 0.89, 0.89], -/* GridMinor */ "SI_Colors2" : [0.83, 0.83, 0.83], -/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], -/* GridBlock */ "SI_Colors6" : [1.0, 1.0, 1.0], -/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], -/* SelectedBrush */ "SI_Colors11": [1.0, 0.0, 0.0], -/* CameraSelectedBrush */ "SI_Colors12": [1.0, 0.0, 0.0], -/* Clipper */ "SI_Colors10": [0.0, 0.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], +/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], +/* GridBackground */ "SI_Colors1" : [0.77, 0.77, 0.77], +/* GridMajor */ "SI_Colors3" : [0.89, 0.89, 0.89], +/* GridMinor */ "SI_Colors2" : [0.83, 0.83, 0.83], +/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], +/* GridBlock */ "SI_Colors6" : [1.0, 1.0, 1.0], +/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], +/* SelectedBrush */ "SI_Colors11" : [1.0, 0.0, 0.0], +/* CameraSelectedBrush */ "SI_Colors12" : [1.0, 0.0, 0.0], +/* Clipper */ "SI_Colors10" : [0.0, 0.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* CameraIcon */ "ColorCameraIcon" : [0.0, 0.0, 1.0], +/* Axis X */ "ColorsAxisX" : [1.0, 0.0, 0.0], +/* Axis Y */ "ColorsAxisY" : [0.0, 1.0, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.0, 0.0, 1.0], } diff --git a/setup/data/tools/themes/_colors/Q3Radiant Original.json b/setup/data/tools/themes/_colors/Q3Radiant Original.json index 06686841..ec5a9061 100644 --- a/setup/data/tools/themes/_colors/Q3Radiant Original.json +++ b/setup/data/tools/themes/_colors/Q3Radiant Original.json @@ -1,14 +1,18 @@ { -/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], -/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], -/* GridBackground */ "SI_Colors1" : [1.0, 1.0, 1.0], -/* GridMajor */ "SI_Colors3" : [0.5, 0.5, 0.5], -/* GridMinor */ "SI_Colors2" : [1.0, 1.0, 1.0], -/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], -/* GridBlock */ "SI_Colors6" : [0.0, 0.0, 1.0], -/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], -/* SelectedBrush */ "SI_Colors11": [1.0, 0.0, 0.0], -/* CameraSelectedBrush */ "SI_Colors12": [1.0, 0.0, 0.0], -/* Clipper */ "SI_Colors10": [0.0, 0.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], +/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], +/* GridBackground */ "SI_Colors1" : [1.0, 1.0, 1.0], +/* GridMajor */ "SI_Colors3" : [0.5, 0.5, 0.5], +/* GridMinor */ "SI_Colors2" : [1.0, 1.0, 1.0], +/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], +/* GridBlock */ "SI_Colors6" : [0.0, 0.0, 1.0], +/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], +/* SelectedBrush */ "SI_Colors11" : [1.0, 0.0, 0.0], +/* CameraSelectedBrush */ "SI_Colors12" : [1.0, 0.0, 0.0], +/* Clipper */ "SI_Colors10" : [0.0, 0.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* CameraIcon */ "ColorCameraIcon" : [0.0, 0.0, 1.0], +/* Axis X */ "ColorsAxisX" : [1.0, 0.0, 0.0], +/* Axis Y */ "ColorsAxisY" : [0.0, 1.0, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.0, 0.0, 1.0], } diff --git a/setup/data/tools/themes/_colors/QE4 Original.json b/setup/data/tools/themes/_colors/QE4 Original.json index 623249f2..2c66394d 100644 --- a/setup/data/tools/themes/_colors/QE4 Original.json +++ b/setup/data/tools/themes/_colors/QE4 Original.json @@ -1,14 +1,18 @@ { -/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], -/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], -/* GridBackground */ "SI_Colors1" : [1.0, 1.0, 1.0], -/* GridMajor */ "SI_Colors3" : [0.5, 0.5, 0.5], -/* GridMinor */ "SI_Colors2" : [0.75, 0.75, 0.75], -/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], -/* GridBlock */ "SI_Colors6" : [0.0, 0.0, 1.0], -/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], -/* SelectedBrush */ "SI_Colors11": [1.0, 0.0, 0.0], -/* CameraSelectedBrush */ "SI_Colors12": [1.0, 0.0, 0.0], -/* Clipper */ "SI_Colors10": [0.0, 0.0, 1.0], -/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* TextureBackground */ "SI_Colors0" : [0.25, 0.25, 0.25], +/* CameraBackground */ "SI_Colors4" : [0.25, 0.25, 0.25], +/* GridBackground */ "SI_Colors1" : [1.0, 1.0, 1.0], +/* GridMajor */ "SI_Colors3" : [0.5, 0.5, 0.5], +/* GridMinor */ "SI_Colors2" : [0.75, 0.75, 0.75], +/* GridText */ "SI_Colors7" : [0.0, 0.0, 0.0], +/* GridBlock */ "SI_Colors6" : [0.0, 0.0, 1.0], +/* Brush */ "SI_Colors8" : [0.0, 0.0, 0.0], +/* SelectedBrush */ "SI_Colors11" : [1.0, 0.0, 0.0], +/* CameraSelectedBrush */ "SI_Colors12" : [1.0, 0.0, 0.0], +/* Clipper */ "SI_Colors10" : [0.0, 0.0, 1.0], +/* OrthoViewName */ "SI_Colors9" : [0.5, 0.0, 0.75], +/* CameraIcon */ "ColorCameraIcon" : [0.0, 0.0, 1.0], +/* Axis X */ "ColorsAxisX" : [1.0, 0.0, 0.0], +/* Axis Y */ "ColorsAxisY" : [0.0, 1.0, 0.0], +/* Axis Z */ "ColorsAxisZ" : [0.0, 0.0, 1.0], }