[Orxonox-commit 3593] r8278 - in code/branches/portals: data/levels src/modules/portals
anbueche at orxonox.net
anbueche at orxonox.net
Thu Apr 21 13:03:41 CEST 2011
Author: anbueche
Date: 2011-04-21 13:03:40 +0200 (Thu, 21 Apr 2011)
New Revision: 8278
Modified:
code/branches/portals/data/levels/portals.oxw
code/branches/portals/src/modules/portals/PortalEndPoint.cc
Log:
flares as billboard
Modified: code/branches/portals/data/levels/portals.oxw
===================================================================
--- code/branches/portals/data/levels/portals.oxw 2011-04-20 18:49:58 UTC (rev 8277)
+++ code/branches/portals/data/levels/portals.oxw 2011-04-21 11:03:40 UTC (rev 8278)
@@ -38,7 +38,7 @@
<Template name=portalDefault>
<PortalEndPoint>
<attached>
- <Billboard material="Portals/Default" />
+ <Billboard material="Examples/Flare" />
</attached>
</PortalEndPoint>
</Template>
Modified: code/branches/portals/src/modules/portals/PortalEndPoint.cc
===================================================================
--- code/branches/portals/src/modules/portals/PortalEndPoint.cc 2011-04-20 18:49:58 UTC (rev 8277)
+++ code/branches/portals/src/modules/portals/PortalEndPoint.cc 2011-04-21 11:03:40 UTC (rev 8278)
@@ -89,5 +89,4 @@
entity->setVelocity(this->getWorldOrientation() * entity->getVelocity());
}
-
}
More information about the Orxonox-commit
mailing list