~ubuntu-branches/ubuntu/utopic/sweethome3d/utopic

« back to all changes in this revision

Viewing changes to src/com/eteks/sweethome3d/viewcontroller/HomeController3D.java

Committer: Package Import Robot
Author(s): Gabriele Giacone
Date: 2013-11-05 13:02:16 UTC
mfrom: (1.1.14)
Revision ID: package-import@ubuntu.com-20131105130216-0e7dgqqvdq4pwm96

Tags: 4.2+dfsg-1

New upstream release.

files added:
.pc/01noMacOSX/src/com/eteks/sweethome3d/HomeFramePane.java

deploy/SweetHome3DApplet.jnlp

deploy/SweetHome3DViewer.jnlp

src/com/eteks/sweethome3d/io/resources/fixedTriangleWindow85x85.obj

src/com/eteks/sweethome3d/io/resources/fixedTriangleWindow85x85.png

src/com/eteks/sweethome3d/io/resources/halfRoundWindow.obj

src/com/eteks/sweethome3d/io/resources/halfRoundWindow.png

src/com/eteks/sweethome3d/io/resources/roundDoorFrame.obj

src/com/eteks/sweethome3d/io/resources/roundDoorFrame.png

src/com/eteks/sweethome3d/io/resources/roundWindow.obj

src/com/eteks/sweethome3d/io/resources/roundWindow.png

src/com/eteks/sweethome3d/io/resources/roundedDoor.obj

src/com/eteks/sweethome3d/io/resources/roundedDoor.png

src/com/eteks/sweethome3d/resources/frameIcon128x128.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/helpLargerFont.css

files removed:
src/com/eteks/sweethome3d/SweetHome3DJavaWebStartBootstrap.java

files modified:
.classpath

.pc/00build.xml/build.xml

.pc/01noMacOSX/src/com/eteks/sweethome3d/SweetHome3D.java

.pc/01noMacOSX/src/com/eteks/sweethome3d/tools/OperatingSystem.java

.pc/02noadditionalprovisions/build.xml

.pc/03novideo/build.xml

.pc/03novideo/src/com/eteks/sweethome3d/swing/package.properties

.pc/03novideo/src/com/eteks/sweethome3d/viewcontroller/HomeController.java

.pc/04manifest/build.xml

.settings/org.eclipse.jdt.core.prefs

.settings/org.eclipse.jdt.ui.prefs

ChangeLog

README.TXT

THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT

build.xml

debian/README.source

debian/changelog

debian/patches/00build.xml

debian/patches/01noMacOSX

debian/patches/03novideo

debian/patches/04manifest

debian/sweethome3d.sh

deploy/SweetHome3D.jnlp

deploy/SweetHome3DApplet.html

deploy/SweetHome3DViewer.html

install/linux/SweetHome3D

install/macosx/Sweet Home 3D/Contents/Info.plist

install/macosx/Sweet Home 3D/Contents/Resources/SweetHome3D.icns

install/macosx/Sweet Home 3D/Contents/Resources/SweetHome3DDocument.icns

install/windows/installerInnoSetup.iss

install/windows/installerLaunch4j.xml

install/windows/signedInstallerInnoSetup.iss

src/com/eteks/sweethome3d/HomeFramePane.java

src/com/eteks/sweethome3d/MacOSXConfiguration.java

src/com/eteks/sweethome3d/SweetHome3D.java

src/com/eteks/sweethome3d/SweetHome3DBootstrap.java

src/com/eteks/sweethome3d/applet/AppletApplication.java

src/com/eteks/sweethome3d/applet/AppletUserPreferences.java

src/com/eteks/sweethome3d/applet/SweetHome3DApplet.java

src/com/eteks/sweethome3d/applet/SweetHome3DViewer.java

src/com/eteks/sweethome3d/applet/package.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_bg.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_cs.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_de.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_el.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_es.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_fr.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_hu.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_it.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_ja.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_pl.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_pt.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_ru.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_sv.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_vi.properties

src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog_zh_CN.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.java

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_bg.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_cs.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_de.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_el.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_es.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_fr.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_hu.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_it.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_ja.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_pl.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_pt.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_ru.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_sv.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_vi.properties

src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_zh_CN.properties

src/com/eteks/sweethome3d/io/DefaultHomeOutputStream.java

src/com/eteks/sweethome3d/j3d/Ground3D.java

src/com/eteks/sweethome3d/j3d/HomePieceOfFurniture3D.java

src/com/eteks/sweethome3d/j3d/ModelManager.java

src/com/eteks/sweethome3d/j3d/Object3DBranch.java

src/com/eteks/sweethome3d/j3d/PhotoRenderer.java

src/com/eteks/sweethome3d/j3d/Room3D.java

src/com/eteks/sweethome3d/j3d/TextureManager.java

src/com/eteks/sweethome3d/j3d/Wall3D.java

src/com/eteks/sweethome3d/model/CatalogDoorOrWindow.java

src/com/eteks/sweethome3d/model/CatalogPieceOfFurniture.java

src/com/eteks/sweethome3d/model/DoorOrWindow.java

src/com/eteks/sweethome3d/model/Home.java

src/com/eteks/sweethome3d/model/HomeDoorOrWindow.java

src/com/eteks/sweethome3d/model/HomeFurnitureGroup.java

src/com/eteks/sweethome3d/model/HomePieceOfFurniture.java

src/com/eteks/sweethome3d/model/PieceOfFurniture.java

src/com/eteks/sweethome3d/package.properties

src/com/eteks/sweethome3d/swing/AutoCompleteTextField.java

src/com/eteks/sweethome3d/swing/BackgroundImageWizardStepsPanel.java

src/com/eteks/sweethome3d/swing/ColorButton.java

src/com/eteks/sweethome3d/swing/FileContentManager.java

src/com/eteks/sweethome3d/swing/FurnitureCatalogListPanel.java

src/com/eteks/sweethome3d/swing/HomeComponent3D.java

src/com/eteks/sweethome3d/swing/HomePane.java

src/com/eteks/sweethome3d/swing/ImportedFurnitureWizardStepsPanel.java

src/com/eteks/sweethome3d/swing/ImportedTextureWizardStepsPanel.java

src/com/eteks/sweethome3d/swing/ModelPreviewComponent.java

src/com/eteks/sweethome3d/swing/PhotoPanel.java

src/com/eteks/sweethome3d/swing/PhotosPanel.java

src/com/eteks/sweethome3d/swing/PlanComponent.java

src/com/eteks/sweethome3d/swing/ScaledImageComponent.java

src/com/eteks/sweethome3d/swing/SwingTools.java

src/com/eteks/sweethome3d/swing/ThreadedTaskPanel.java

src/com/eteks/sweethome3d/swing/VideoPanel.java

src/com/eteks/sweethome3d/swing/VisualTransferHandler.java

src/com/eteks/sweethome3d/swing/package.properties

src/com/eteks/sweethome3d/swing/package_fr.properties

src/com/eteks/sweethome3d/swing/package_pt.properties

src/com/eteks/sweethome3d/swing/resources/aboutIcon.png

src/com/eteks/sweethome3d/tools/OperatingSystem.java

src/com/eteks/sweethome3d/viewcontroller/HomeController.java

src/com/eteks/sweethome3d/viewcontroller/HomeController3D.java

src/com/eteks/sweethome3d/viewcontroller/HomeFurnitureController.java

src/com/eteks/sweethome3d/viewcontroller/PhotosController.java

src/com/eteks/sweethome3d/viewcontroller/WallController.java

src/com/eteks/sweethome3d/viewcontroller/resources/help/de/images/addingFurniture.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/de/images/drawingWalls.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingPreferences.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/en/images/addingFurniture.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/en/images/drawingWalls.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/es/images/addingFurniture.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/es/images/drawingWalls.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingPreferences.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/addingFurniture.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/drawingWalls.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/savingHome.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/images/applicationIcon.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/it/images/addingFurniture.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/it/images/drawingWalls.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/addingFurniture.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/addingTexts.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/creatingHome.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/drawingDimensions.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/drawingRooms.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/drawingWalls.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editing3DView.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingDimensions.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingFurniture.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingPreferences.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingRooms.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingWalls.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/importingBackground.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/importingFurniture.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/index.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/printingHome.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/savingHome.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/tips.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/tocCreating.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/tocEditing.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/tocImporting.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/tocStart.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/ui.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/images/addingFurniture.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/images/drawingWalls.png

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/addingFurniture.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/addingTexts.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/creatingHome.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/drawingDimensions.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/drawingRooms.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/drawingWalls.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editing3DView.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingDimensions.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingFurniture.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingPreferences.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingRooms.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingWalls.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/importingBackground.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/importingFurniture.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/index.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/printingHome.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/savingHome.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/tips.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/tocCreating.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/tocEditing.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/tocImporting.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/tocStart.html

src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/ui.html

test/com/eteks/sweethome3d/junit/LevelTest.java

test/com/eteks/sweethome3d/junit/OBJWriterTest.java

test/com/eteks/sweethome3d/junit/resources/home1.sh3d

Show diffs side-by-side

added added

removed removed

src/com/eteks/sweethome3d/viewcontroller/HomeController3D.java

623

+ homeBoundsDepth * homeBoundsDepth

624

+ homeBoundsHeight * homeBoundsHeight) / 2;

625

this.minDistanceToAerialViewCenter = halfDiagonal * 1.05f;

626

this.maxDistanceToAerialViewCenter = Math.max(5 * this.minDistanceToAerialViewCenter, 1000);

626

this.maxDistanceToAerialViewCenter = Math.max(5 * this.minDistanceToAerialViewCenter, 2500);

627

}

628

629

@Override

Older »