Attachment #539118 for bug #660884

Lines 7-14 include(CMakePackageConfigHelpers) Link Here

(-)a/CMakeLists.txt (-2 / +1 lines)
7	option(BUILD_PYTHON "Build " ON)	7	option(BUILD_PYTHON "Build " ON)
8	option(BUILD_STATIC "Build as a static library" OFF)	8	option(BUILD_STATIC "Build as a static library" OFF)
9		9
10		10	find_package(pugixml REQUIRED)
11	add_subdirectory(pugixml)
12		11
13	if(BUILD_PYTHON)	12	if(BUILD_PYTHON)
14	set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)	13	set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)




 */

#include "MeshData.h"
#include <pugixml.hpp>
#include <iostream>

using namespace Savitar;

        int v1 = faces.at(i).getV1();
        int v2 = faces.at(i).getV2();
        int v3 = faces.at(i).getV3();

        // Add vertices for face 1
        float x = vertices.at(v1).getX();
        float y = vertices.at(v1).getY();

{
    return vertices;
}




Lines 17-23 Link Here

(-)a/src/Scene.cpp (-1 / +1 lines)
17	*/	17	*/
18		18
19	#include "Scene.h"	19	#include "Scene.h"
20	#include "../pugixml/src/pugixml.hpp"	20	#include <pugixml.hpp>
21	#include <iostream>	21	#include <iostream>
22	#include <string>	22	#include <string>
23	using namespace Savitar;	23	using namespace Savitar;

Lines 17-23 Link Here

(-)a/src/SceneNode.cpp (-2 / +1 lines)
17	*/	17	*/
18		18
19	#include "SceneNode.h"	19	#include "SceneNode.h"
20	#include "../pugixml/src/pugixml.hpp"	20	#include <pugixml.hpp>
21	#include <iostream>	21	#include <iostream>
22	using namespace Savitar;	22	using namespace Savitar;
23		23
Lines 121-124 std::vector< SceneNode*> SceneNode::getAllChildren() Link Here
121	}	121	}
122	return all_children;	122	return all_children;
123	}	123	}
124

Lines 21-27 Link Here

(-)a/src/ThreeMFParser.h (-2 / +2 lines)
21		21
22	#include "SavitarExport.h"	22	#include "SavitarExport.h"
23	#include "SceneNode.h"	23	#include "SceneNode.h"
24	#include "../pugixml/src/pugixml.hpp"	24	#include <pugixml.hpp>
25		25
26	#include <string>	26	#include <string>
27	namespace Savitar	27	namespace Savitar
Lines 44-47 namespace Savitar Link Here
44	std::string sceneToString(Scene scene);	44	std::string sceneToString(Scene scene);
45	};	45	};
46	}	46	}
47	#endif	47	#endif

Return to bug 660884

Lines 17-23 Link Here

(-)a/src/MeshData.cpp (-5 / +2 lines)
17	*/	17	*/
18		18
19	#include "MeshData.h"	19	#include "MeshData.h"
20	#include "../pugixml/src/pugixml.hpp"	20	#include <pugixml.hpp>
21	#include <iostream>	21	#include <iostream>
22		22
23	using namespace Savitar;	23	using namespace Savitar;
Lines 85-91 bytearray MeshData::getFlatVerticesAsBytes() Link Here
85	int v1 = faces.at(i).getV1();	85	int v1 = faces.at(i).getV1();
86	int v2 = faces.at(i).getV2();	86	int v2 = faces.at(i).getV2();
87	int v3 = faces.at(i).getV3();	87	int v3 = faces.at(i).getV3();
88		88
89	// Add vertices for face 1	89	// Add vertices for face 1
90	float x = vertices.at(v1).getX();	90	float x = vertices.at(v1).getX();
91	float y = vertices.at(v1).getY();	91	float y = vertices.at(v1).getY();
Lines 188-193 std::vector< Vertex > MeshData::getVertices() Link Here
188	{	188	{
189	return vertices;	189	return vertices;
190	}	190	}
191
192
193