diff --git a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat index 2ddb45afee..9ab88f1d3e 100644 --- a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat +++ b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat @@ -121,12 +121,6 @@ EmissiveColor = ; Description to be updated FragmentShader = -; Description to be updated -SectionFillPattern = - -; Description to be updated -SectionLinewidth = - ; Description to be updated Shininess = @@ -145,6 +139,12 @@ Transparency = ; Description to be updated VertexShader = +; Description to be updated +SectionFillPattern = + +; Description to be updated +SectionLinewidth = + ; Description to be updated ViewColor = diff --git a/src/Mod/Material/StandardMaterial/Tools/Materials.csv b/src/Mod/Material/StandardMaterial/Tools/Materials.csv index ae34e41309..f15aa0b60f 100644 --- a/src/Mod/Material/StandardMaterial/Tools/Materials.csv +++ b/src/Mod/Material/StandardMaterial/Tools/Materials.csv @@ -1,4 +1,4 @@ -FileName|Name|NameDE|Description|DescriptionDE|DescriptionPL|Father|KindOfMaterial|KindOfMaterialDE|MaterialNumber|Norm|ReferenceSource|SourceURL|StandardCode|AngleOfFriction|CompressiveStrength|Density|FractureToughness|PoissonRatio|ShearModulus|UltimateStrain|UltimateTensileStrength|YieldStrength|YoungsModulus|SpecificHeat|ThermalConductivity|ThermalExpansionCoefficient|Color|EnvironmentalEfficiencyClass|ExecutionInstructions|Finish|FireResistanceClass|Model|SoundTransmissionClass|UnitsPerQuantity|AmbientColor|DiffuseColor|EmissiveColor|FragmentShader|SectionFillPattern|SectionLinewidth|Shininess|SpecularColor|TexturePath|TextureScaling|Transparency|VertexShader|ViewColor|ViewFillPattern|ViewLinewidth|ProductURL|SpecificPrice|Vendor +FileName|Name|NameDE|Description|DescriptionDE|DescriptionPL|Father|KindOfMaterial|KindOfMaterialDE|MaterialNumber|Norm|ReferenceSource|SourceURL|StandardCode|AngleOfFriction|CompressiveStrength|Density|FractureToughness|PoissonRatio|ShearModulus|UltimateStrain|UltimateTensileStrength|YieldStrength|YoungsModulus|SpecificHeat|ThermalConductivity|ThermalExpansionCoefficient|Color|EnvironmentalEfficiencyClass|ExecutionInstructions|Finish|FireResistanceClass|Model|SoundTransmissionClass|UnitsPerQuantity|AmbientColor|DiffuseColor|EmissiveColor|FragmentShader|Shininess|SpecularColor|TexturePath|TextureScaling|Transparency|VertexShader|SectionFillPattern|SectionLinewidth|ViewColor|ViewFillPattern|ViewLinewidth|ProductURL|SpecificPrice|Vendor ABS-Generic|ABS||This is a blend AcrylnitrilButadienStyrol (ABS) material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised ABS-blend cards.|||Thermoplast||||||http://www.matweb.com/search/DataSheet.aspx?MatGUID=eb7a78f5948d481c9493a67f0d089646||||1060 kg/m^3||0.37|||38.8 MPa|44.1 MPa|2300 MPa|2050 J/kg/K|0.158 W/m/K|0.000093 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Acrylonitrile_butadiene_styrene|| Acrylic-Glass-Generic|Acrylic Glass||Poly(methyl methacrylate) (PMMA, acrylic, acrylic glass, trade names Plexiglas, Acrylite, Lucite, Perspex) a transparent thermoplastic often used in sheet form as a lightweight or shatter-resistant alternative to glass.||Szkło akrylowe (szkło organiczne; inaczej pleksi, pleksiglas, metapleks) – przezroczyste tworzywo sztuczne, którego głównym składnikiem jest polimer – poli(metakrylan metylu) (PMMA).|of the material, i.e. for PLA is Thermoplast, for Steel is Metal Thermoplast||||||http://www.matweb.com/search/DataSheet.aspx?MatGUID=632572aeef2a4224b5ac8fbd4f1b6f77|||103 MPa|1160 kg/m^3||0.38|1.08 GPa||57.7 MPa|73.7 MPa|2550 MPa|1480 J/kg/K|0.193 W/m/K|0.000075 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Poly(methyl_methacrylate)|| AlMg3F24|AlMg3F24|AlMg3F24||||Metal|Aluminium|Aluminium|3.3535.26|DIN 1725||||||2700 kg/m^3||0.3|27000 MPa|5|250 MPa|180 MPa|70000 MPa|||0.000023 m/m/K|||||||||||||||||||||||||| diff --git a/src/Mod/Material/StandardMaterial/Tools/Materials.ods b/src/Mod/Material/StandardMaterial/Tools/Materials.ods index b9733de0c8..dd12350207 100644 Binary files a/src/Mod/Material/StandardMaterial/Tools/Materials.ods and b/src/Mod/Material/StandardMaterial/Tools/Materials.ods differ diff --git a/src/Mod/Material/StandardMaterial/Tools/headers b/src/Mod/Material/StandardMaterial/Tools/headers index 07c429fab8..2aa97773ef 100644 --- a/src/Mod/Material/StandardMaterial/Tools/headers +++ b/src/Mod/Material/StandardMaterial/Tools/headers @@ -37,14 +37,14 @@ AmbientColor DiffuseColor EmissiveColor FragmentShader -SectionFillPattern -SectionLinewidth Shininess SpecularColor TexturePath TextureScaling Transparency VertexShader +SectionFillPattern +SectionLinewidth ViewColor ViewFillPattern ViewLinewidth