From 2481f1c8dc794708689680b98c0532502c5dbdf8 Mon Sep 17 00:00:00 2001
From: Sandro Weber <webers@in.tum.de>
Date: Wed, 10 Feb 2016 15:10:55 +0100
Subject: [PATCH] [nostory] materials under http/ should not have been ignored
Change-Id: I37409c0a8e4c083dec3c8e5a57aae73613075f09
---
.gitignore | 1 -
.../materials/OrangeTransparent.material | 23 +++++++++++++++++++
http/client/assets/materials/black.material | 12 ++++++++++
http/client/assets/materials/blue.material | 12 ++++++++++
http/client/assets/materials/green.material | 12 ++++++++++
http/client/assets/materials/grey.material | 12 ++++++++++
http/client/assets/materials/red.material | 12 ++++++++++
7 files changed, 83 insertions(+), 1 deletion(-)
create mode 100644 http/client/assets/materials/OrangeTransparent.material
create mode 100644 http/client/assets/materials/black.material
create mode 100644 http/client/assets/materials/blue.material
create mode 100644 http/client/assets/materials/green.material
create mode 100644 http/client/assets/materials/grey.material
create mode 100644 http/client/assets/materials/red.material
diff --git a/.gitignore b/.gitignore
index 48a844a..105c12c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
build/
gzbridge/build/
-http/
node_modules/
diff --git a/http/client/assets/materials/OrangeTransparent.material b/http/client/assets/materials/OrangeTransparent.material
new file mode 100644
index 0000000..4f5a536
--- /dev/null
+++ b/http/client/assets/materials/OrangeTransparent.material
@@ -0,0 +1,23 @@
+material Gazebo/OrangeTransparent
+{
+ receive_shadows off
+
+ technique
+ {
+ pass
+ {
+ scene_blend alpha_blend
+ depth_write off
+
+ ambient 1.0 0.44 0.0 1
+ diffuse 1.0 0.44 0.0 1
+
+ texture_unit
+ {
+ colour_op_ex source1 src_current src_current 0 1 0
+ alpha_op_ex source1 src_manual src_current 0.4
+ }
+
+ }
+ }
+}
diff --git a/http/client/assets/materials/black.material b/http/client/assets/materials/black.material
new file mode 100644
index 0000000..7eb44b9
--- /dev/null
+++ b/http/client/assets/materials/black.material
@@ -0,0 +1,12 @@
+material Gazebo/Black
+{
+ technique
+ {
+ pass ambient
+ {
+ ambient 0 0 0
+ diffuse 0 0 0
+ specular 0.1 0.1 0.1 1 5
+ }
+ }
+}
diff --git a/http/client/assets/materials/blue.material b/http/client/assets/materials/blue.material
new file mode 100644
index 0000000..7dec09d
--- /dev/null
+++ b/http/client/assets/materials/blue.material
@@ -0,0 +1,12 @@
+material Gazebo/Blue
+{
+ technique
+ {
+ pass ambient
+ {
+ ambient 0 0 1
+ diffuse 0 0 1
+ specular 0.1 0.1 0.1 1 1
+ }
+ }
+}
diff --git a/http/client/assets/materials/green.material b/http/client/assets/materials/green.material
new file mode 100644
index 0000000..c5d93e5
--- /dev/null
+++ b/http/client/assets/materials/green.material
@@ -0,0 +1,12 @@
+material Gazebo/Green
+{
+ technique
+ {
+ pass ambient
+ {
+ ambient 0 1 0
+ diffuse 0 1 0
+ specular 0.1 0.1 0.1 1 1
+ }
+ }
+}
diff --git a/http/client/assets/materials/grey.material b/http/client/assets/materials/grey.material
new file mode 100644
index 0000000..aa552db
--- /dev/null
+++ b/http/client/assets/materials/grey.material
@@ -0,0 +1,12 @@
+material Gazebo/Grey
+{
+ technique
+ {
+ pass main
+ {
+ ambient .3 .3 .3 1.0
+ diffuse .7 .7 .7 1.0
+ specular 0.01 0.01 0.01 1.000000 1.500000
+ }
+ }
+}
diff --git a/http/client/assets/materials/red.material b/http/client/assets/materials/red.material
new file mode 100644
index 0000000..047dc73
--- /dev/null
+++ b/http/client/assets/materials/red.material
@@ -0,0 +1,12 @@
+material Gazebo/Red
+{
+ technique
+ {
+ pass ambient
+ {
+ ambient 1 0 0
+ diffuse 1 0 0
+ specular 0.1 0.1 0.1 1 1
+ }
+ }
+}
--
GitLab