From 3b932c27b7b1009ef404da5a7e0613d9cd3e7bf5 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 3 Jan 2019 00:35:38 +0200 Subject: SL-10288 Mesh uploader changes from Firestorm --- indra/newview/app_settings/settings.xml | 199 ++++++++++++++++++++- .../shaders/class1/objects/previewV.glsl | 8 +- 2 files changed, 199 insertions(+), 8 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3ad8b6cded..a58fa2d7a0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6628,8 +6628,189 @@ Value 600 - MigrateCacheDirectory - + MeshPreviewCanvasColor + + Comment + Canvas colour for the Mesh uploader + Persist + 1 + Type + Color4 + Value + + 0.169 + 0.169 + 0.169 + 1.0 + + + MeshPreviewEdgeColor + + Comment + Edge colour for the Mesh uploader preview + Persist + 1 + Type + Color4 + Value + + 0.4 + 0.4 + 0.4 + 1.0 + + + MeshPreviewBaseColor + + Comment + base diffuse colour for the Mesh uploader + Persist + 1 + Type + Color4 + Value + + 1.0 + 1.0 + 1.0 + 1.0 + + + MeshPreviewBrightnessColor + + Comment + Brightness modifier + Persist + 1 + Type + Color3 + Value + + 0.9 + 0.9 + 0.9 + + + MeshPreviewEdgeWidth + + Comment + line thickness used when display edges is selected in mesh preview + Persist + 1 + Type + F32 + Value + 1.0 + + MeshPreviewPhysicsEdgeColor + + Comment + Edge colour for the Mesh uploader physics preview + Persist + 1 + Type + Color4 + Value + + 0.0 + 0.25 + 0.5 + 0.25 + + + MeshPreviewPhysicsFillColor + + Comment + Fill colour for the Mesh uploader physics preview + Persist + 1 + Type + Color4 + Value + + 0.0 + 0.5 + 1.0 + 0.5 + + + MeshPreviewPhysicsEdgeWidth + + Comment + line thickness used when display physics is selected in mesh preview + Persist + 1 + Type + F32 + Value + 1.0 + + MeshPreviewDegenerateEdgeColor + + Comment + Edge colour for the Mesh uploader Degenerate preview + Persist + 1 + Type + Color4 + Value + + 1.0 + 0.0 + 0.0 + 1.0 + + + MeshPreviewDegenerateFillColor + + Comment + Fill colour for the Mesh uploader Degenerate preview + Persist + 1 + Type + Color4 + Value + + 1.0 + 0.0 + 0.0 + 0.5 + + + MeshPreviewDegenerateEdgeWidth + + Comment + line thickness used when display Degenerate is selected in mesh preview + Persist + 1 + Type + F32 + Value + 3.0 + + MeshPreviewDegeneratePointSize + + Comment + Large point size used to highlight degenerate triangle vertices in Mesh preview + Persist + 1 + Type + F32 + Value + 8.0 + + MeshPreviewZoomLimit + + Comment + Maximum Zoom level in preview + Persist + 1 + Type + F32 + Value + 10.0 + + Comment Check for old version of disk cache to migrate to current location Persist @@ -7868,7 +8049,17 @@ Value 13 - + PreviewRenderSize + + Comment + Resolution of the image rendered for the mesh upload preview + Persist + 1 + Type + S32 + Value + 1024 + PreviewAmbientColor Comment @@ -7885,8 +8076,6 @@ 1.0 - - PreviewDiffuse0 Comment diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl index 7f3f84398b..3424613e94 100644 --- a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl @@ -91,8 +91,10 @@ void main() // Collect normal lights (need to be divided by two, as we later multiply by 2) col.rgb += light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz); - col.rgb += light_diffuse[2].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z); - col.rgb += light_diffuse[3].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z); - +// col.rgb += light_diffuse[2].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z); + col.rgb += light_diffuse[2].rgb * calcDirectionalLight(norm, light_position[2].xyz); +// col.rgb += light_diffuse[3].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z); + col.rgb += light_diffuse[3].rgb * calcDirectionalLight(norm, light_position[3].xyz); + col /= 2.0; vertex_color = col*color; } -- cgit v1.2.3 From c9d0222526c422ee7a5bff140b034e88aa5d0b39 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 3 Jan 2019 01:19:41 +0200 Subject: SL-10288 settings.xml fix --- indra/newview/app_settings/settings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a58fa2d7a0..091992d1ab 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6810,6 +6810,7 @@ Value 10.0 + MigrateCacheDirectory Comment Check for old version of disk cache to migrate to current location @@ -16469,3 +16470,4 @@ + -- cgit v1.2.3 From dd3a3693729cc700872a6e94e0ae4898cf25c3fb Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 3 Jan 2019 14:30:01 +0200 Subject: SL-10288 comments cleanup --- indra/newview/app_settings/shaders/class1/objects/previewV.glsl | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl index 3424613e94..de2ea2a065 100644 --- a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl @@ -91,9 +91,7 @@ void main() // Collect normal lights (need to be divided by two, as we later multiply by 2) col.rgb += light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz); -// col.rgb += light_diffuse[2].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z); col.rgb += light_diffuse[2].rgb * calcDirectionalLight(norm, light_position[2].xyz); -// col.rgb += light_diffuse[3].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z); col.rgb += light_diffuse[3].rgb * calcDirectionalLight(norm, light_position[3].xyz); col /= 2.0; vertex_color = col*color; -- cgit v1.2.3 From e906af7c3c6e4efd84b344c9572167f6ddf836fc Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 11 Jan 2019 17:39:26 +0200 Subject: SL-10327 FIXED Scalable preview of mesh model is shown with black bar on top in the Upload Model menu --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 091992d1ab..76cfc03b53 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8053,7 +8053,7 @@ PreviewRenderSize Comment - Resolution of the image rendered for the mesh upload preview + Resolution of the image rendered for the mesh upload preview (must be a power of 2) Persist 1 Type -- cgit v1.2.3 From d38fd1e7c3a48260f670e135501bba68d9d4dc51 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 21 Apr 2020 18:55:29 +0300 Subject: SL-13081 Model is unnaturally grey --- indra/newview/app_settings/shaders/class1/objects/previewV.glsl | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl index 2cf17acf6b..4bb588335a 100644 --- a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl @@ -93,6 +93,5 @@ void main() col.rgb += light_diffuse[1].rgb * calcDirectionalLight(norm, light_position[1].xyz); col.rgb += light_diffuse[2].rgb*calcLocalLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z); col.rgb += light_diffuse[3].rgb*calcLocalLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z); - col /= 2.0; vertex_color = col*color; } -- cgit v1.2.3 From 72ba7f1dad43306a761b35dc984734dae04c1c6d Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 22 Apr 2020 20:55:57 +0300 Subject: SL-13077 remove floater specific variables from settings.xml --- indra/newview/app_settings/settings.xml | 193 -------------------------------- 1 file changed, 193 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c1a2c0ff7a..b2d1d2e589 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6661,188 +6661,6 @@ Value 600 - MeshPreviewCanvasColor - - Comment - Canvas colour for the Mesh uploader - Persist - 1 - Type - Color4 - Value - - 0.169 - 0.169 - 0.169 - 1.0 - - - MeshPreviewEdgeColor - - Comment - Edge colour for the Mesh uploader preview - Persist - 1 - Type - Color4 - Value - - 0.4 - 0.4 - 0.4 - 1.0 - - - MeshPreviewBaseColor - - Comment - base diffuse colour for the Mesh uploader - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - MeshPreviewBrightnessColor - - Comment - Brightness modifier - Persist - 1 - Type - Color3 - Value - - 0.9 - 0.9 - 0.9 - - - MeshPreviewEdgeWidth - - Comment - line thickness used when display edges is selected in mesh preview - Persist - 1 - Type - F32 - Value - 1.0 - - MeshPreviewPhysicsEdgeColor - - Comment - Edge colour for the Mesh uploader physics preview - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.25 - 0.5 - 0.25 - - - MeshPreviewPhysicsFillColor - - Comment - Fill colour for the Mesh uploader physics preview - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.5 - 1.0 - 0.5 - - - MeshPreviewPhysicsEdgeWidth - - Comment - line thickness used when display physics is selected in mesh preview - Persist - 1 - Type - F32 - Value - 1.0 - - MeshPreviewDegenerateEdgeColor - - Comment - Edge colour for the Mesh uploader Degenerate preview - Persist - 1 - Type - Color4 - Value - - 1.0 - 0.0 - 0.0 - 1.0 - - - MeshPreviewDegenerateFillColor - - Comment - Fill colour for the Mesh uploader Degenerate preview - Persist - 1 - Type - Color4 - Value - - 1.0 - 0.0 - 0.0 - 0.5 - - - MeshPreviewDegenerateEdgeWidth - - Comment - line thickness used when display Degenerate is selected in mesh preview - Persist - 1 - Type - F32 - Value - 3.0 - - MeshPreviewDegeneratePointSize - - Comment - Large point size used to highlight degenerate triangle vertices in Mesh preview - Persist - 1 - Type - F32 - Value - 8.0 - - MeshPreviewZoomLimit - - Comment - Maximum Zoom level in preview - Persist - 1 - Type - F32 - Value - 10.0 - MigrateCacheDirectory Comment @@ -8094,17 +7912,6 @@ Value 13 - PreviewRenderSize - - Comment - Resolution of the image rendered for the mesh upload preview (must be a power of 2) - Persist - 1 - Type - S32 - Value - 1024 - PreviewAmbientColor Comment -- cgit v1.2.3