eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-02 21:49:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:libremapping/libremapping

Browse Source 
Conflicts:
	Common.cpp
	Common.h
	DestinationGLCanvas.cpp
	SourceGLCanvas.cpp
	main.cpp
This commit is contained in:
Tats
2013-11-29 12:09:49 -05:00
parent 97379366e3 0e73f157f8
commit fd958cecf2
40 changed files with 1605 additions and 1580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Common.cpp
View File

@@ -34,16 +34,6 @@ Quad* Common::createQuadForTexture(Texture* texture, int frameWidth, int frameHe
Point(texture->getX() + texture->getWidth(), texture->getY() + texture->getHeight()),
Point(texture->getX(), texture->getY() + texture->getHeight())
);
// float centerX = frameWidth / 2.0f;
// float centerY = frameHeight / 2.0f;
// float textureHalfWidth = texture->getWidth() / 2.0f;
// float textureHalfHeight = texture->getHeight() / 2.0f;
//
// return new Quad(
// Point(centerX-textureHalfWidth, centerY-textureHalfHeight),
// Point(centerX+textureHalfWidth, centerY-textureHalfHeight),
// Point(centerX+textureHalfWidth, centerY+textureHalfHeight),
// Point(centerX-textureHalfWidth, centerY+textureHalfHeight));
}
void Common::addImage(const QString imagePath, int frameWidth, int frameHeight)
@@ -55,10 +45,8 @@ void Common::addImage(const QString imagePath, int frameWidth, int frameHeight)
TextureMapping* tm = new TextureMapping(
img,
// Destination.
createQuadForTexture(img, frameWidth, frameHeight),
// Input.
createQuadForTexture(img, frameWidth, frameHeight)
);