Merge pull request #2027 from John3/portalFolder

move portal shape into a folder

Templates/Modules/FPSGameplay/art/shapes/materials.cs

@@ -118,44 +118,4 @@ singleton Material(noshapetext_noshape_mat)
 	translucentBlendOp = "None";
 };
 
-//--- noshapetext.dae MATERIALS END ---
-
-//--- portal MATERIALS BEGIN ---
-
-singleton Material(portal5_portal_top)
-{
-   mapTo = "portal_top";
-
-	diffuseMap[0] = "top";
-   normalMap[0]  = "top-normal";
-
-   diffuseColor[0] = "0.4 0.4 0.4 1";
-	specular[0] = "0.5 0.5 0.5 1";
-	specularPower[0] = 2;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = false;
-	translucentBlendOp = "None";
-};
-
-singleton Material(portal5_portal_lightray)
-{
-   mapTo = "portal_lightray";
-
-	diffuseMap[0] = "lightray";
-
-	diffuseColor[0] = "0.4 0.4 0.4 0.64462";
-	specular[0] = "0.5 0.5 0.5 1";
-	specularPower[0] = 2;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = 1;
-	translucent = true;
-	translucentBlendOp = "AddAlpha";
-   castShadows = "0";
-};
-//--- portal MATERIALS END ---
-
+//--- noshapetext.dae MATERIALS END ---

Templates/Modules/FPSGameplay/art/shapes/portal/materials.cs

@@ -0,0 +1,25 @@
+
+singleton Material(portal_base_mat)
+{
+   mapTo = "portal_base";
+   diffuseMap[0] = "data/FPSGameplay/art/shapes/portal/base.png";
+   normalMap[0] = "data/FPSGameplay/art/shapes/portal/base-normal.png";
+};
+
+singleton Material(portal_top_mat)
+{
+   mapTo = "portal_top";
+   diffuseMap[0] = "data/FPSGameplay/art/shapes/portal/top.png";
+   normalMap[0] = "data/FPSGameplay/art/shapes/portal/top-normal.png";
+   emissive[0] = "1";
+};
+
+singleton Material(portal_lightray_mat)
+{
+   mapTo = "portal_lightray";
+   diffuseMap[0] = "data/FPSGameplay/art/shapes/portal/lightray.png";
+   translucent = "1";
+   translucentBlendOp = "AddAlpha";
+   doubleSided = "1";
+   emissive[0] = "1";
+};