diff options
| author | prep <prep@lindenlab.com> | 2011-11-17 13:32:04 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-11-17 13:32:04 -0500 |
| commit | 378c076d1df5d911e07959638fbd61a9094384d2 (patch) | |
| tree | d0e6f8868cc78539b05847d089200c2da68d4746 /indra/llrender | |
| parent | 9f996fdc5684a3e55c9f86508979ad943e2eaded (diff) | |
WIP: navmesh station posts to a url, responder receives llsd and then has the llpathing library extract and render the navmesh (if desired).
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.h | 2 | ||||
| -rw-r--r-- | indra/llrender/llrendersegment.cpp | 54 | ||||
| -rw-r--r-- | indra/llrender/llrendersegment.h | 49 |
3 files changed, 104 insertions, 1 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index d736133f3f..5b2fcf422c 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -33,7 +33,7 @@ #include <boost/unordered_map.hpp> #include <list> -#include "llerror.h" +//#include "llerror.h" #include "v4color.h" #include "llstring.h" #include "stdtypes.h" diff --git a/indra/llrender/llrendersegment.cpp b/indra/llrender/llrendersegment.cpp new file mode 100644 index 0000000000..8f856f62f3 --- /dev/null +++ b/indra/llrender/llrendersegment.cpp @@ -0,0 +1,54 @@ +/**
+ * @file llrendersegment.cpp
+ * @brief
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+// Sphere creates a set of display lists that can then be called to create
+// a lit sphere at different LOD levels. You only need one instance of sphere
+// per viewer - then call the appropriate list.
+ +#include "linden_common.h"
+#include "llrendersegment.h"
+#include "llerror.h"
+#include "llglheaders.h"
+
+LLRenderSegment gSegment;
+//=============================================================================
+void LLRenderSegment::renderSegment( const LLVector3& start, const LLVector3& end, int color )
+{
+ LLColor4 colorA = LLColor4::yellow;
+
+ gGL.color4fv( colorA.mV ); + + gGL.begin(LLRender::LINES); + { + gGL.vertex3fv( start.mV ); + + gGL.vertex3fv( end.mV ); + } + + gGL.end();
+
+}
+//=============================================================================
\ No newline at end of file diff --git a/indra/llrender/llrendersegment.h b/indra/llrender/llrendersegment.h new file mode 100644 index 0000000000..d929d6f628 --- /dev/null +++ b/indra/llrender/llrendersegment.h @@ -0,0 +1,49 @@ +/**
+ * @file llrendersegment.h
+ * @brief
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLRENDERSEGMENT_H
+#define LL_LLRENDERSEGMENT_H
+
+#include "llmath.h"
+#include "v3math.h"
+#include "v4math.h"
+#include "m3math.h"
+#include "m4math.h"
+#include "v4color.h"
+#include "llgl.h"
+
+
+class LLRenderSegment
+{
+public:
+ void renderSegment( const LLVector3& start, const LLVector3& end, int color );
+
+private:
+};
+
+extern LLRenderSegment gSegment;
+
+#endif
|