From fea02f249cca7844196dafb3b098958920ecc990 Mon Sep 17 00:00:00 2001
From: timoore <timoore>
Date: Mon, 16 Nov 2009 07:24:32 +0000
Subject: [PATCH] Add emissive and shininess parameters to default terrain and
 model effects

Whoops, forgot those.


Author: Tim Moore <timoore@redhat.com>
---
 Effects/model-default.eff   | 4 ++++
 Effects/terrain-default.eff | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index 3cafe42f2..31946123c 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -26,6 +26,8 @@
         <ambient><use>material/ambient</use></ambient>
         <diffuse><use>material/diffuse</use></diffuse>
         <specular><use>material/specular</use></specular>
+        <emissive><use>material/emissive</use></emissive>
+        <shininess><use>material/shininess</use></shininess>
         <color-mode><use>material/color-mode</use></color-mode>
       </material>
       <blend>
@@ -67,6 +69,8 @@
         <ambient><use>material/ambient</use></ambient>
         <diffuse><use>material/diffuse</use></diffuse>
         <specular><use>material/specular</use></specular>
+        <emissive><use>material/emissive</use></emissive>
+        <shininess><use>material/shininess</use></shininess>
         <color-mode><use>material/color-mode</use></color-mode>
       </material>
       <blend>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index 4f4967081..768aee0f8 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -42,6 +42,7 @@
     <predicate>
       <and>
         <property>/sim/rendering/shader-effects</property>
+
         <or>
           <less-equal>
             <value type="float">2.0</value>
@@ -62,6 +63,8 @@
         <ambient><use>material/ambient</use></ambient>
         <diffuse><use>material/diffuse</use></diffuse>
         <specular><use>material/specular</use></specular>
+        <emissive><use>material/emissive</use></emissive>
+        <shininess><use>material/shininess</use></shininess>
         <color-mode>ambient-and-diffuse</color-mode>
       </material>
       <blend><use>transparent</use></blend>
@@ -99,6 +102,8 @@
         <ambient><use>material/ambient</use></ambient>
         <diffuse><use>material/diffuse</use></diffuse>
         <specular><use>material/specular</use></specular>
+        <emissive><use>material/emissive</use></emissive>
+        <shininess><use>material/shininess</use></shininess>
         <color-mode>ambient-and-diffuse</color-mode>
       </material>
       <blend><use>transparent</use></blend>