ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3058 Commits
21 Branches
19 Tags
70 MiB
Tree: 8c2291aa49
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '8c2291aa49'
${ noResults }
magnum/src/Magnum/Primitives/UVSphere.cpp

76 lines
3.2 KiB
Raw Normal View History Unescape

Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
/*
This file is part of Magnum.
Relicensing to MIT/Expat license, part 3: source files. Added license header also to shader sources. Hopefully it won't harm compilation times too much.
13 years ago
Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
*/
#include "UVSphere.h"
Trade: return references, not pointers from MeshData. The access methods assert that the user is querying only available data. Also updated Primitives implementation to create MeshData when everything is done, not creating empty MeshData and then shooting the data through interface intended for end users.
13 years ago
#include "Math/Vector3.h"
Extracted Primitive enum from Mesh to MeshPrimitive. Because we can't forward-declare class members we would need to include whole Mesh (along with all OpenGL headers and other stuff) just to use Primitive enum. The old Mesh::Primitive is now alias to new one, is marked as deprecated and will be removed in future release.
13 years ago
#include "Mesh.h"
Trade: return references, not pointers from MeshData. The access methods assert that the user is querying only available data. Also updated Primitives implementation to create MeshData when everything is done, not creating empty MeshData and then shooting the data through interface intended for end users.
13 years ago
#include "Primitives/Implementation/Spheroid.h"
Primitives: wireframe versions of Capsule, Cylinder and UVSphere. Simplified representation of the shapes, i.e. an UVSphere is visualized by three circles, one for each axis. Will be used mainly in DebugTools.
13 years ago
#include "Primitives/Implementation/WireframeSpheroid.h"
Trade: return references, not pointers from MeshData. The access methods assert that the user is querying only available data. Also updated Primitives implementation to create MeshData when everything is done, not creating empty MeshData and then shooting the data through interface intended for end users.
13 years ago
#include "Trade/MeshData3D.h"
Reduced #includes in headers. Magnum.h now doesn't include anything except OpenGL headers, thus changes in Math library don't trigger recompilation of everything, but only of things really depending on it. Math constants moved to separate file for similar reasons, de-inlined some functions to remove the need for some #includes.
14 years ago
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
namespace Magnum { namespace Primitives {
Primitives: reworked remaining classes to have the same API as the rest. Now every primitive can be created using `solid()` or `wireframe()` function returning directly Trade::MeshData.
13 years ago
Trade::MeshData3D UVSphere::solid(UnsignedInt rings, UnsignedInt segments, TextureCoords textureCoords) {
Extracted Primitive enum from Mesh to MeshPrimitive. Because we can't forward-declare class members we would need to include whole Mesh (along with all OpenGL headers and other stuff) just to use Primitive enum. The old Mesh::Primitive is now alias to new one, is marked as deprecated and will be removed in future release.
13 years ago
CORRADE_ASSERT(rings >= 2 && segments >= 3, "UVSphere must have at least two rings and three segments", Trade::MeshData3D(MeshPrimitive::Triangles, std::vector<UnsignedInt>{}, std::vector<std::vector<Vector3>>{}, std::vector<std::vector<Vector3>>{}, std::vector<std::vector<Vector2>>{}));
Primitives: reworked remaining classes to have the same API as the rest. Now every primitive can be created using `solid()` or `wireframe()` function returning directly Trade::MeshData.
13 years ago
Implementation::Spheroid sphere(segments, textureCoords == TextureCoords::Generate ?
Implementation::Spheroid::TextureCoords::Generate :
Implementation::Spheroid::TextureCoords::DontGenerate);
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
Primitives: using new type aliases in whole Primitives namespace.
13 years ago
Float textureCoordsVIncrement = 1.0f/rings;
Code cleanup: shorter angle initializers.
13 years ago
Rad ringAngleIncrement(Constants::pi()/rings);
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
/* Bottom cap vertex */
Primitives: reworked remaining classes to have the same API as the rest. Now every primitive can be created using `solid()` or `wireframe()` function returning directly Trade::MeshData.
13 years ago
sphere.capVertex(-1.0f, -1.0f, 0.0f);
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
/* Vertex rings */
Primitives: reworked remaining classes to have the same API as the rest. Now every primitive can be created using `solid()` or `wireframe()` function returning directly Trade::MeshData.
13 years ago
sphere.hemisphereVertexRings(rings-1, 0.0f, -Rad(Constants::pi())/2+ringAngleIncrement, ringAngleIncrement, textureCoordsVIncrement, textureCoordsVIncrement);
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
/* Top cap vertex */
Primitives: reworked remaining classes to have the same API as the rest. Now every primitive can be created using `solid()` or `wireframe()` function returning directly Trade::MeshData.
13 years ago
sphere.capVertex(1.0f, 1.0f, 1.0f);
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
/* Faces */
Primitives: reworked remaining classes to have the same API as the rest. Now every primitive can be created using `solid()` or `wireframe()` function returning directly Trade::MeshData.
13 years ago
sphere.bottomFaceRing();
sphere.faceRings(rings-2);
sphere.topFaceRing();
Trade: return references, not pointers from MeshData. The access methods assert that the user is querying only available data. Also updated Primitives implementation to create MeshData when everything is done, not creating empty MeshData and then shooting the data through interface intended for end users.
13 years ago
return sphere.finalize();
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
}
Primitives: wireframe versions of Capsule, Cylinder and UVSphere. Simplified representation of the shapes, i.e. an UVSphere is visualized by three circles, one for each axis. Will be used mainly in DebugTools.
13 years ago
Trade::MeshData3D UVSphere::wireframe(const UnsignedInt rings, const UnsignedInt segments) {
Extracted Primitive enum from Mesh to MeshPrimitive. Because we can't forward-declare class members we would need to include whole Mesh (along with all OpenGL headers and other stuff) just to use Primitive enum. The old Mesh::Primitive is now alias to new one, is marked as deprecated and will be removed in future release.
13 years ago
CORRADE_ASSERT(rings >= 2 && rings%2 == 0 && segments >= 4 && segments%2 == 0, "Primitives::UVSphere::wireframe(): improper parameters", Trade::MeshData3D(MeshPrimitive::Lines, std::vector<UnsignedInt>{}, std::vector<std::vector<Vector3>>{}, std::vector<std::vector<Vector3>>{}, std::vector<std::vector<Vector2>>{}));
Primitives: wireframe versions of Capsule, Cylinder and UVSphere. Simplified representation of the shapes, i.e. an UVSphere is visualized by three circles, one for each axis. Will be used mainly in DebugTools.
13 years ago
Implementation::WireframeSpheroid sphere(segments/4);
/* Make sphere */
sphere.bottomHemisphere(0.0f, rings/2);
sphere.ring(0.0f);
sphere.topHemisphere(0.0f, rings/2);
return sphere.finalize();
}
Capsule and UVSphere primitive, with normals and texture coordinates.
14 years ago
}}