Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UrdfImporter: Collada DAE, rudimentary support for polylist (for ANYmal), assumes all polygons have 3 vertices

Browse Source 
remove obsolete env from __init__.py
This commit is contained in:
Erwin Coumans
2018-05-23 00:28:49 +10:00
parent 9a706d9cfd
commit f5952a73e7
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp
View File

@@ -188,8 +188,20 @@ void readLibraryGeometries(XMLDocument& doc, btAlignedObjectArray<GLInstanceGrap
} }
vertexSources.insert(vertexId,vs); vertexSources.insert(vertexId,vs);
btAlignedObjectArray<XMLElement*> trianglesAndPolylists;
for (XMLElement* primitive = mesh->FirstChildElement("triangles"); primitive; primitive = primitive->NextSiblingElement("triangles")) for (XMLElement* primitive = mesh->FirstChildElement("triangles"); primitive; primitive = primitive->NextSiblingElement("triangles"))
{ {
trianglesAndPolylists.push_back(primitive);
}
for (XMLElement* primitive = mesh->FirstChildElement("polylist"); primitive; primitive = primitive->NextSiblingElement("polylist"))
{
trianglesAndPolylists.push_back(primitive);
}
for (int i=0;i<trianglesAndPolylists.size();i++)
{
XMLElement* primitive = trianglesAndPolylists[i];
std::string positionSourceName; std::string positionSourceName;
std::string normalSourceName; std::string normalSourceName;
int primitiveCount; int primitiveCount;

1
examples/pybullet/gym/pybullet_envs/bullet/__init__.py
View File

@@ -3,6 +3,5 @@ from pybullet_envs.bullet.minitaur_gym_env import MinitaurBulletEnv
from pybullet_envs.bullet.minitaur_duck_gym_env import MinitaurBulletDuckEnv from pybullet_envs.bullet.minitaur_duck_gym_env import MinitaurBulletDuckEnv
from pybullet_envs.bullet.racecarGymEnv import RacecarGymEnv from pybullet_envs.bullet.racecarGymEnv import RacecarGymEnv
from pybullet_envs.bullet.racecarZEDGymEnv import RacecarZEDGymEnv from pybullet_envs.bullet.racecarZEDGymEnv import RacecarZEDGymEnv
from pybullet_envs.bullet.simpleHumanoidGymEnv import SimpleHumanoidGymEnv
from pybullet_envs.bullet.kukaGymEnv import KukaGymEnv from pybullet_envs.bullet.kukaGymEnv import KukaGymEnv
from pybullet_envs.bullet.kukaCamGymEnv import KukaCamGymEnv from pybullet_envs.bullet.kukaCamGymEnv import KukaCamGymEnv