David Williams avatar David Williams committed 62f273b

Small changes, hoping to help the Linux version compile.

Comments (0)

Files changed (2)

library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl

 			{
 				for(int32_t sx = m_regSrc.getLowerX(), dx = m_regDst.getLowerX(); dx <= m_regDst.getUpperX(); sx++,dx++)
 				{
-					const typename SrcVolumeType::VoxelType& tSrcVoxel = m_pVolSrc->getVoxel<WrapModes::DontCheck>(sx,sy,sz);
+					const typename SrcVolumeType::VoxelType& tSrcVoxel = m_pVolSrc->getVoxel(sx,sy,sz, WrapModes::DontCheck); // FIXME use templatised version of getVoxel(), but watch out for Linux compile issues.
 					const typename DstVolumeType::VoxelType& tDstVoxel = static_cast<typename DstVolumeType::VoxelType>(tSrcVoxel);
 					m_pVolDst->setVoxelAt(dx,dy,dz,tDstVoxel);
 				}

tests/TestAStarPathfinder.cpp

 		return false;
 	}
 
-	typename VolumeType::VoxelType voxel = volData->getVoxel<WrapModes::None>(v3dPos);
+	typename VolumeType::VoxelType voxel = volData->getVoxel(v3dPos, WrapModes::None);  // FIXME use templatised version of getVoxel(), but watch out for Linux compile issues.
 	if(voxel != 0)
 	{
 		return false;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.