From 7c83226659981c337cae5c4e22837052429e4bfa Mon Sep 17 00:00:00 2001
From: ponchio <federico.ponchio@isti.cnr.it>
Date: Wed, 31 Mar 2004 15:08:39 +0000
Subject: [PATCH] *** empty log message ***

---
 apps/test/trackball/main.cpp         |  24 +----
 apps/test/trackball/trackball.sln    |  10 +-
 apps/test/trackball/trackball.vcproj | 150 +++++++++++++++------------
 3 files changed, 90 insertions(+), 94 deletions(-)

diff --git a/apps/test/trackball/main.cpp b/apps/test/trackball/main.cpp
index 615a929e..9bd8956f 100644
--- a/apps/test/trackball/main.cpp
+++ b/apps/test/trackball/main.cpp
@@ -1,22 +1,6 @@
 #include <iostream>
 using namespace std;
 
-template <class A, class B> class pippo {
-public:
-  int a() { return 1; }
-};
-
-template <> class pippo<int, int> {
-public:
-  int a() { return 2; }
-};
-
-int main() {
-  pippo<int, int> p;
-  cerr << p.a() << endl;
-  return 0;
-}
-/*
 #include<windows.h>
 #include <SDL/SDL.h>
 
@@ -75,9 +59,9 @@ bool init() {
 
 
 
-int wmain(int argc, unsigned short **argv) {
+int wmain(int argc, unsigned short **argv) {  
   if(!init()) return -1;
-
+  
   Trackball trackball;
 
   int quit = 0;
@@ -152,7 +136,7 @@ int wmain(int argc, unsigned short **argv) {
     gluPerspective(60, 1, 0.1, 100);
 	  glMatrixMode(GL_MODELVIEW);
 	  glLoadIdentity();
-	  gluLookAt(0,0,4,   0,0,0,   0,1,0);        
+	  gluLookAt(0,0,8,   0,0,0,   0,1,0);        
     glRotatef(130, 1, 1, 0);
     glTranslatef(0, 0.7, 1);
     
@@ -176,4 +160,4 @@ int wmain(int argc, unsigned short **argv) {
 
   return -1;
 }
-  */
\ No newline at end of file
+  
\ No newline at end of file
diff --git a/apps/test/trackball/trackball.sln b/apps/test/trackball/trackball.sln
index 48a03b85..2c4a2438 100644
--- a/apps/test/trackball/trackball.sln
+++ b/apps/test/trackball/trackball.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trackball", "trackball.vcproj", "{68C30FC8-1096-4ED9-ACC3-BA7B720F56C8}"
+Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "trackball", "trackball.icproj", "{BFD1CCD1-E974-402C-9A01-4289A1A420D5}"
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
@@ -9,10 +9,10 @@ Global
 	GlobalSection(ProjectDependencies) = postSolution
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{68C30FC8-1096-4ED9-ACC3-BA7B720F56C8}.Debug.ActiveCfg = Debug|Win32
-		{68C30FC8-1096-4ED9-ACC3-BA7B720F56C8}.Debug.Build.0 = Debug|Win32
-		{68C30FC8-1096-4ED9-ACC3-BA7B720F56C8}.Release.ActiveCfg = Release|Win32
-		{68C30FC8-1096-4ED9-ACC3-BA7B720F56C8}.Release.Build.0 = Release|Win32
+		{BFD1CCD1-E974-402C-9A01-4289A1A420D5}.Debug.ActiveCfg = Debug|Win32
+		{BFD1CCD1-E974-402C-9A01-4289A1A420D5}.Debug.Build.0 = Debug|Win32
+		{BFD1CCD1-E974-402C-9A01-4289A1A420D5}.Release.ActiveCfg = Release|Win32
+		{BFD1CCD1-E974-402C-9A01-4289A1A420D5}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/apps/test/trackball/trackball.vcproj b/apps/test/trackball/trackball.vcproj
index 143d750b..7417e828 100644
--- a/apps/test/trackball/trackball.vcproj
+++ b/apps/test/trackball/trackball.vcproj
@@ -1,142 +1,154 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject 
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="trackball"
-	ProjectGUID="{68C30FC8-1096-4ED9-ACC3-BA7B720F56C8}"
-	Keyword="ManagedCProj">
+	ProjectGUID="{378B2139-BFC0-47F0-A4C0-8E4616C2FB88}"
+	Keyword="Win32Proj"
+	OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}">
 	<Platforms>
-		<Platform
+		<Platform 
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
-		<Configuration
+		<Configuration 
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
-			CharacterSet="2"
-			ManagedExtensions="TRUE">
-			<Tool
+			CharacterSet="2">
+			<Tool 
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="c:\sf\vcg"
-				PreprocessorDefinitions="WIN32;_DEBUG"
-				MinimalRebuild="FALSE"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"/>
-			<Tool
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool 
 				Name="VCCustomBuildTool"/>
-			<Tool
+			<Tool 
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib glut32.lib SDL.lib"
+				AdditionalDependencies="SDL.lib opengl32.lib glu32.lib"
 				OutputFile="$(OutDir)/trackball.exe"
 				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"/>
-			<Tool
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/trackball.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool 
 				Name="VCMIDLTool"/>
-			<Tool
+			<Tool 
 				Name="VCPostBuildEventTool"/>
-			<Tool
+			<Tool 
 				Name="VCPreBuildEventTool"/>
-			<Tool
+			<Tool 
 				Name="VCPreLinkEventTool"/>
-			<Tool
+			<Tool 
 				Name="VCResourceCompilerTool"/>
-			<Tool
+			<Tool 
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
+			<Tool 
 				Name="VCWebDeploymentTool"/>
 		</Configuration>
-		<Configuration
+		<Configuration 
 			Name="Release|Win32"
 			OutputDirectory="Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
-			CharacterSet="2"
-			ManagedExtensions="TRUE">
-			<Tool
+			CharacterSet="2">
+			<Tool 
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="c:\sf\vcg"
-				PreprocessorDefinitions="WIN32;NDEBUG"
-				MinimalRebuild="FALSE"
-				WarningLevel="3"/>
-			<Tool
+				OmitFramePointers="TRUE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool 
 				Name="VCCustomBuildTool"/>
-			<Tool
+			<Tool 
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib glut32.lib SDL.lib"
 				OutputFile="$(OutDir)/trackball.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"/>
-			<Tool
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool 
 				Name="VCMIDLTool"/>
-			<Tool
+			<Tool 
 				Name="VCPostBuildEventTool"/>
-			<Tool
+			<Tool 
 				Name="VCPreBuildEventTool"/>
-			<Tool
+			<Tool 
 				Name="VCPreLinkEventTool"/>
-			<Tool
+			<Tool 
 				Name="VCResourceCompilerTool"/>
-			<Tool
+			<Tool 
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
+			<Tool 
 				Name="VCWebDeploymentTool"/>
 		</Configuration>
 	</Configurations>
 	<Files>
-		<Filter
+		<Filter 
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
-			<File
+			<File 
 				RelativePath="main.cpp">
 			</File>
+			<File 
+				RelativePath="..\..\..\wrap\gui\trackball.cpp">
+			</File>
+			<File 
+				RelativePath="..\..\..\wrap\gui\trackmode.cpp">
+			</File>
 		</Filter>
-		<Filter
+		<Filter 
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc">
-			<File
+			<File 
 				RelativePath="..\..\..\vcg\math\base.h">
 			</File>
-			<File
-				RelativePath="..\..\..\vcg\space\box3.h">
+			<File 
+				RelativePath="..\..\..\wrap\gui\frustum.h">
 			</File>
-			<File
-				RelativePath="..\..\..\wrap\GUI\frustum.h">
+			<File 
+				RelativePath="..\..\..\wrap\gl\math.h">
 			</File>
-			<File
+			<File 
 				RelativePath="..\..\..\vcg\math\matrix44.h">
 			</File>
-			<File
-				RelativePath="..\..\..\vcg\space\point3.h">
-			</File>
-			<File
+			<File 
 				RelativePath="..\..\..\vcg\math\quaternion.h">
 			</File>
-			<File
+			<File 
 				RelativePath="..\..\..\vcg\math\similarity.h">
 			</File>
-			<File
-				RelativePath="..\..\..\wrap\GUI\trackball.h">
+			<File 
+				RelativePath="..\..\..\wrap\gui\trackball.h">
 			</File>
-			<File
-				RelativePath="..\..\..\wrap\GUI\trackmode.h">
+			<File 
+				RelativePath="..\..\..\wrap\gui\trackmode.h">
 			</File>
-			<File
-				RelativePath="..\..\..\wrap\GUI\view.h">
-			</File>
-			<File
-				RelativePath="..\..\..\wrap\gl\wrap.h">
+			<File 
+				RelativePath="..\..\..\wrap\gui\view.h">
 			</File>
 		</Filter>
-		<Filter
+		<Filter 
 			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;r">
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 		</Filter>
 	</Files>
 	<Globals>