From 49729a61ae811f98e7514343709330c03df33323 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Aug 2011 23:41:41 +0200 Subject: [PATCH] renamed ominous "Smooth" texture to "none", removed reference in docs to Smooth and made it 512x512 In OC, actually every material has its predefined set of textures, so the default texturing of >=CR is obsolete. The "Smooth" texture is a relic of that which is currently only used because of the "Vehicle" material. --- docs/de.po | 4 ++-- docs/sdk/script/fn/DrawMaterialQuad.xml | 2 +- planet/Material.ocg/Smooth.jpg | Bin 2859 -> 0 bytes planet/Material.ocg/none.png | Bin 0 -> 1542 bytes src/game/landscape/C4Material.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 planet/Material.ocg/Smooth.jpg create mode 100644 planet/Material.ocg/none.png diff --git a/docs/de.po b/docs/de.po index 8adc5bc61..ef5f7e050 100644 --- a/docs/de.po +++ b/docs/de.po @@ -8379,8 +8379,8 @@ msgid "If true, the material will be drawn as 'underground'." msgstr "Wenn true, wird das Material unterirdisch gezeichnet." #: sdk/script/fn/DrawMaterialQuad.xml:65(desc) -msgid "Draws a four-cornered polygon of the specified material and texture into the landscape. If no texture is specified, Smooth is assumed." -msgstr "Zeichnet ein viereckiges Polygon im angegebenen Material mit der angegebenen Textur. Wenn keine Textur angegeben ist, wird Smooth angenommen." +msgid "Draws a four-cornered polygon of the specified material and texture into the landscape." +msgstr "Zeichnet ein viereckiges Polygon im angegebenen Material mit der angegebenen Textur." #: sdk/script/fn/DrawMaterialQuad.xml:66(remark) msgid "The corners of the polygon should be specified in clockwise order and polygon boundaries should not intersect. For more complex or concave shapes you make multiple calls to this function." diff --git a/docs/sdk/script/fn/DrawMaterialQuad.xml b/docs/sdk/script/fn/DrawMaterialQuad.xml index f5df53c55..5a9adac19 100644 --- a/docs/sdk/script/fn/DrawMaterialQuad.xml +++ b/docs/sdk/script/fn/DrawMaterialQuad.xml @@ -62,7 +62,7 @@ - Draws a four-cornered polygon of the specified material and texture into the landscape. If no texture is specified, Smooth is assumed. + Draws a four-cornered polygon of the specified material and texture into the landscape. The corners of the polygon should be specified in clockwise order and polygon boundaries should not intersect. For more complex or concave shapes you make multiple calls to this function. diff --git a/planet/Material.ocg/Smooth.jpg b/planet/Material.ocg/Smooth.jpg deleted file mode 100644 index 7762799360a9f373c43184f7ec82601b4cb3c97b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2859 zcmbtU3pkW%8-BmZu=G%1lzj#E*Z96J298(YecOCm)g zWNcFug{5pYJC$5pp{1g>LP-ukTP!-v|9;;{?Oy%Yc3uDT&HH@s^WN{_{+@a6S9M?Y z1Tfu2ZX$r72v`Uopz0+bSh7AMDk5@y#1_82^$hU!JU36Q7vRRkX8;5~V{aTIX%iR; z`YA-L|JN9MMZ}tfhYlfjBxw;b0*J_*Nkm!@R2xd1I!FWyflX*AM8cuhAV!d}k-W^T z@ewf5;o`j@zeWd^n1?e=ve2i=d0 zbRZ~FpqpRzgV}<#Wx+0rf+z>Q#^r4xf1Ka@%iZYqS0eNDllv|lR{qxUy0H9O)3ZUJ z(3toPS;h6{=R>nxS4g()KT=eA<6h^VEP$erEs5Yn(I5*53Wl~iB*;KtLtrgCrw zSC=;Q+nWSF-5PgjzBe~0a^`@k22OxtCQvj&5(Rp}F3TOFLfXbD{BH*4A1SC>039RF zWC152mrl81&|{)EA?$*YleXM8C?Kt-Ks0UkW7?9M;-T&~4t9or@x@QW`?4O3 zt~iI+cI;skJwN_uhhIg;x%lJs?NYhq>r0?3zBY&IW1Gx(i~J!ar}|`(s{ZUy{LVQ3 zp=j)ytJ%ZUzRe1SU?489%RA^7;lz~A;diw$l*Su0H^WX(6Xu*5>8obgE* zU}7lt>16;25vfb`i#+<#uyOljC0;V*G)J|QM2oxiJ$;I{G3D#=17fj~Yt-R$~yOiRmcc}A6 zZTmazmnYe`7t%VWmu^j|hij+^3gr$G(FX#37Qcgcpk#@8oB4ea2#8-JtXp?C%d=g$ zfqyP@**j90dsg>BC!aSSDnKlRcLo`x9_0$wls(BX%^#kcy(NPw9^qe}QP;E9D!FjL zv4`zlQ>5gkoU~43=>GgYu?oLkKvk1p61V` z&L?!sUM|<&9lM{d0)f5XCag_r<({uUTU=2R6J6sfxz&^YDr@o7CHHQ&3>s9o4vrB* zQ4J@MG@RE@AI-j&yiBHml|`8;0Y4$-Pz>$J-^XCijO%Pu_eK29hG{EgiF zjScK}2ooEe2b2a+c3(2Q9ZDs6+ca@Pybf;T?b9)BmK(huEbCw&Z8hF?!FW#f0pRG! z$&!3EC|Rpc9s&=l8p*xea^YB3Q_ioO@>O7ttIgXh>$H}1Ta4>n|B>-U=lYwL7Bq{6V`%~%dFIN@& zKA&lMtT~l|RvrwjYL&g`0jqUa7v|cU-mv%7lQo|1wCjy&T^%-i+lx!gi-PnFA7_iO zY^CO|H~Q%@-OABvR*kKq^1|)0uGJ1UCMDR?>%*(*2J+D#EiD4y=Do`|a&7%KG3(wL z{|C19r;ZCQar=B_^>T@}07EvOSu`~AFIV>4opVMaN2dM6I7zFhm}nko@q1+Urs7Ro zTJGJ>YqmHzRbSyTJ2uyExUyuL|5UfUe6QOTiuyYx(f3yBRBP$fT$3#DIQL|4hW8}p zo6+kv$0`c~qHZ0ryz;0!=egrWW=x-@d}Ci_*G<{%m%FtjN88Lcgfx|B*O+_ycy&$p z^=tZl;&e@~1@+wfi_>>xg!j^XJ$5C1^Q%bVB;FP@ujqvhX!LmQ^03#S>V$Y@N@qmC z{fUCbia?Rl*DG*UOq^wA+^y20*jWFq!zF{FWfTj+=?eewG;z+X)u+D8%k|rTCu#I` vX2Q`yT~^7U|B1TOJA2Gsw4J3^|K3n4WqBqPKeM2U-B0X^`~K8U)r0>6+bxx+ diff --git a/planet/Material.ocg/none.png b/planet/Material.ocg/none.png new file mode 100644 index 0000000000000000000000000000000000000000..8561c9ab10ad9c31e68e7ab5b6d3d2aef2096bdf GIT binary patch literal 1542 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&t&wwUqN(AjMc5^O9BnESxY!r>-R@lC^GmdKI;Vst0L4$G A6#xJL literal 0 HcmV?d00001 diff --git a/src/game/landscape/C4Material.cpp b/src/game/landscape/C4Material.cpp index 54f180dad..6c83c79ae 100644 --- a/src/game/landscape/C4Material.cpp +++ b/src/game/landscape/C4Material.cpp @@ -525,7 +525,7 @@ bool C4MaterialMap::CrossMapMaterials() // Called after load szTextureOverlay = TextureMap.GetEntry(iTexMapIx)->GetTextureName(); // default to smooth if (!szTextureOverlay) - szTextureOverlay = "Smooth"; + szTextureOverlay = "none"; // search/create entry in texmap Map[cnt].DefaultMatTex = ::TextureMap.GetIndex(Map[cnt].Name, szTextureOverlay, true, FormatString("DefaultMatTex of mat %s", Map[cnt].Name).getData());