spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove using namespace from headers

pull/1150/head
Andrew Tribick 2021-11-05 23:28:55 +01:00 committed by ajtribick
parent e00f5b7d2c
commit 80d098f3c9
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/celengine/spheremesh.cpp
View File

@ -342,17 +342,17 @@ void SphereMesh::displace(DisplacementMapFunc func, void* info)
}
Mesh* SphereMesh::convertToMesh() const
cmod::Mesh* SphereMesh::convertToMesh() const
{
uint32_t stride = 32;
Mesh::VertexAttribute attributes[3];
attributes[0] = Mesh::VertexAttribute(Mesh::Position, Mesh::Float3, 0);
attributes[1] = Mesh::VertexAttribute(Mesh::Normal, Mesh::Float3, 12);
attributes[2] = Mesh::VertexAttribute(Mesh::Texture0, Mesh::Float2, 24);
cmod::Mesh::VertexAttribute attributes[3];
attributes[0] = cmod::Mesh::VertexAttribute(cmod::Mesh::Position, cmod::Mesh::Float3, 0);
attributes[1] = cmod::Mesh::VertexAttribute(cmod::Mesh::Normal, cmod::Mesh::Float3, 12);
attributes[2] = cmod::Mesh::VertexAttribute(cmod::Mesh::Texture0, cmod::Mesh::Float2, 24);
Mesh* mesh = new Mesh();
cmod::Mesh* mesh = new cmod::Mesh();
mesh->setVertexDescription(Mesh::VertexDescription(stride, 3, attributes));
mesh->setVertexDescription(cmod::Mesh::VertexDescription(stride, 3, attributes));
// Copy the vertex data from the separate position, normal, and texture coordinate
// arrays into a single array.
@ -382,7 +382,7 @@ Mesh* SphereMesh::convertToMesh() const
indexData[j * 2 + 1] = (i + 1) * (nSlices + 1) + j;
}
mesh->addGroup(Mesh::TriStrip, ~0u, (nSlices + 1) * 2, indexData);
mesh->addGroup(cmod::Mesh::TriStrip, ~0u, (nSlices + 1) * 2, indexData);
}
return mesh;

4
src/celengine/spheremesh.h
View File

@ -18,8 +18,6 @@
#include <celengine/dispmap.h>
#include <celmodel/mesh.h>
using namespace cmod;
/*! The SphereMesh class is used to generate displacement mapped
* spheres when loading the now-deprecated .cms geometry files.
@ -41,7 +39,7 @@ public:
~SphereMesh();
//! Convert this object into a standard Celestia mesh.
Mesh* convertToMesh() const;
cmod::Mesh* convertToMesh() const;
private:
void createSphere(float radius, int _nRings, int _nSlices);

14
src/celestia/win32/odmenu.h
View File

@ -5,24 +5,22 @@
#include <map>
#include <string>
using namespace std;
enum bitmapType {eNormal, eDisabled, eShadow, eFaded};
typedef struct tagODMENUITEM
{
UINT dwType;
UINT wID;
string rawText;
string displayText;
string rawDisplayText;
string shortcutText;
std::string rawText;
std::string displayText;
std::string rawDisplayText;
std::string shortcutText;
HBITMAP hBitmap;
bool topMost;
} ODMENUITEM;
typedef map<UINT, ODMENUITEM> ODMENUITEMS;
typedef std::map<UINT, ODMENUITEM> ODMENUITEMS;
class ODMenu
{
@ -94,4 +92,4 @@ public:
void DeleteItem(HMENU hMenu, int index);
};
#endif
#endif