[Orxonox-commit 2007] r6724 - in code/branches/lod: data/levels src/orxonox/graphics
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Apr 13 22:11:37 CEST 2010
Author: rgrieder
Date: 2010-04-13 22:11:36 +0200 (Tue, 13 Apr 2010)
New Revision: 6724
Modified:
code/branches/lod/data/levels/presentationLOD.oxw
code/branches/lod/data/levels/presentationLODdif.oxw
code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc
code/branches/lod/src/orxonox/graphics/MeshLodInformation.h
Log:
svn:eol-style "native" for all text-based files.
Modified: code/branches/lod/data/levels/presentationLOD.oxw
===================================================================
--- code/branches/lod/data/levels/presentationLOD.oxw 2010-04-13 20:09:00 UTC (rev 6723)
+++ code/branches/lod/data/levels/presentationLOD.oxw 2010-04-13 20:11:36 UTC (rev 6724)
@@ -1,24 +1,24 @@
-<?lua
- include("stats.oxo")
- include("hudtemplates3.oxo")
-?>
-
-<?lua
- include("templates/spaceship_assff.oxt")
- include("templates/spaceship_pirate.oxt")
-?>
-
-<Level
- name = "Sample"
- description = "Just a few tests"
->
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
- <Model position="0,10,0" scale=3 mesh="ast3.mesh"/>
- <Model position="0,-10,0" scale=3 mesh="ast3.mesh"/>
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
- <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
- </Scene>
-</Level>
+<?lua
+ include("stats.oxo")
+ include("hudtemplates3.oxo")
+?>
+
+<?lua
+ include("templates/spaceship_assff.oxt")
+ include("templates/spaceship_pirate.oxt")
+?>
+
+<Level
+ name = "Sample"
+ description = "Just a few tests"
+>
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+ <Model position="0,10,0" scale=3 mesh="ast3.mesh"/>
+ <Model position="0,-10,0" scale=3 mesh="ast3.mesh"/>
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+ <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ </Scene>
+</Level>
Property changes on: code/branches/lod/data/levels/presentationLOD.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/lod/data/levels/presentationLODdif.oxw
===================================================================
--- code/branches/lod/data/levels/presentationLODdif.oxw 2010-04-13 20:09:00 UTC (rev 6723)
+++ code/branches/lod/data/levels/presentationLODdif.oxw 2010-04-13 20:11:36 UTC (rev 6724)
@@ -1,35 +1,35 @@
-<?lua
- include("stats.oxo")
- include("hudtemplates3.oxo")
- include("lodinformation.oxt")
-?>
-
-<?lua
- include("templates/spaceship_assff.oxt")
- include("templates/spaceship_pirate.oxt")
-?>
-
-<Level
- name = "Sample"
- description = "Just a few tests"
->
- <lodinformation>
- <MeshLodInformation mesh=ast1.mesh lodQuality=4 />
- </lodinformation>
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
- <Model position="0,10,0" scale=3 mesh="ast3.mesh"/>
- <Model position="0,-10,0" scale=3 mesh="ast3.mesh" lodLevel="1"/>
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
- <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
- </Scene>
-
- <templates>
- <Template link=lodtemplate_default />
- </templates>
-</Level>
-
+<?lua
+ include("stats.oxo")
+ include("hudtemplates3.oxo")
+ include("lodinformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceship_assff.oxt")
+ include("templates/spaceship_pirate.oxt")
+?>
+
+<Level
+ name = "Sample"
+ description = "Just a few tests"
+>
+ <lodinformation>
+ <MeshLodInformation mesh=ast1.mesh lodQuality=4 />
+ </lodinformation>
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+ <Model position="0,10,0" scale=3 mesh="ast3.mesh"/>
+ <Model position="0,-10,0" scale=3 mesh="ast3.mesh" lodLevel="1"/>
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+ <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+ </Scene>
+
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+</Level>
+
\ No newline at end of file
Property changes on: code/branches/lod/data/levels/presentationLODdif.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc
===================================================================
--- code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc 2010-04-13 20:09:00 UTC (rev 6723)
+++ code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc 2010-04-13 20:11:36 UTC (rev 6724)
@@ -1,66 +1,66 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Jan Bernegger
- * Co-authors:
- * ...
- *
- */
-
-#include "MeshLodInformation.h"
-
-#include <OgreEntity.h>
-
-#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "core/XMLPort.h"
-#include "Scene.h"
-
-namespace orxonox
-{
- CreateFactory(MeshLodInformation);
-
- MeshLodInformation::MeshLodInformation(BaseObject* creator) : StaticEntity(creator)
- {
- RegisterObject(MeshLodInformation);
- }
-
- MeshLodInformation::~MeshLodInformation()
- { }
-
- void MeshLodInformation::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(MeshLodInformation, XMLPort, xmlelement, mode);
-
- XMLPortParam(MeshLodInformation, "lodQuality", setLodLevel, getLodLevel, xmlelement, mode).defaultValues(5);
- XMLPortParam(MeshLodInformation, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
- }
-
- std::string getMeshName()
- {
- if(mesh!=null)
- return mesh;
- return "";
- }
-
-
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Jan Bernegger
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "MeshLodInformation.h"
+
+#include <OgreEntity.h>
+
+#include "core/CoreIncludes.h"
+#include "core/GameMode.h"
+#include "core/XMLPort.h"
+#include "Scene.h"
+
+namespace orxonox
+{
+ CreateFactory(MeshLodInformation);
+
+ MeshLodInformation::MeshLodInformation(BaseObject* creator) : StaticEntity(creator)
+ {
+ RegisterObject(MeshLodInformation);
+ }
+
+ MeshLodInformation::~MeshLodInformation()
+ { }
+
+ void MeshLodInformation::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(MeshLodInformation, XMLPort, xmlelement, mode);
+
+ XMLPortParam(MeshLodInformation, "lodQuality", setLodLevel, getLodLevel, xmlelement, mode).defaultValues(5);
+ XMLPortParam(MeshLodInformation, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
+ }
+
+ std::string getMeshName()
+ {
+ if(mesh!=null)
+ return mesh;
+ return "";
+ }
+
+
+}
Property changes on: code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/lod/src/orxonox/graphics/MeshLodInformation.h
===================================================================
--- code/branches/lod/src/orxonox/graphics/MeshLodInformation.h 2010-04-13 20:09:00 UTC (rev 6723)
+++ code/branches/lod/src/orxonox/graphics/MeshLodInformation.h 2010-04-13 20:11:36 UTC (rev 6724)
@@ -1,52 +1,52 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Jan Bernegger
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _MeshLodInformation_H__
-#define _MeshLodInformation_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <string>
-#include "tools/Mesh.h"
-#include "worldentities/StaticEntity.h"
-
-namespace orxonox
-{
- class _OrxonoxExport MeshLodInformation : public BaseObject
- {
- public:
- MeshLodInformation(BaseObject* creator);
- virtual ~MeshLodInformation();
-
- std::string getMeshName();
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- };
-}
-
-#endif /* _MeshLodInformation_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Jan Bernegger
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _MeshLodInformation_H__
+#define _MeshLodInformation_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "tools/Mesh.h"
+#include "worldentities/StaticEntity.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport MeshLodInformation : public BaseObject
+ {
+ public:
+ MeshLodInformation(BaseObject* creator);
+ virtual ~MeshLodInformation();
+
+ std::string getMeshName();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ };
+}
+
+#endif /* _MeshLodInformation_H__ */
Property changes on: code/branches/lod/src/orxonox/graphics/MeshLodInformation.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list