[Ogoglio-commits] SF.net SVN: ogoglio: [208] spaces/trunk/src/com/ogoglio

[<ian...@us...>]

Revision: 208
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=208&view=rev
Author:   iansmith
Date:     2007-07-01 13:25:27 -0700 (Sun, 01 Jul 2007)

Log Message:
-----------
Small mods to allow the development web host to be accessible by a development client (with faster graphics hardware).  These really only affect the initialization-time URL assigned to the Sim (http://127.0.0.1 or http://10.0.1.198, for example) and the library account.  Only matters for developers.

Modified Paths:
--------------
    spaces/trunk/src/com/ogoglio/PrepareDatabase.java
    spaces/trunk/src/com/ogoglio/persist/ServiceInitializationPersistTasks.java
    spaces/trunk/src/com/ogoglio/site/AccountServlet.java
    spaces/trunk/src/com/ogoglio/viewer/j3d/J3DRenderer.java

Modified: spaces/trunk/src/com/ogoglio/PrepareDatabase.java
===================================================================
--- spaces/trunk/src/com/ogoglio/PrepareDatabase.java	2007-07-01 18:46:57 UTC (rev 207)
+++ spaces/trunk/src/com/ogoglio/PrepareDatabase.java	2007-07-01 20:25:27 UTC (rev 208)
@@ -1,8 +1,9 @@
 package com.ogoglio;
 
+import java.net.URI;
+
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.tool.hbm2ddl.SchemaUpdate;
 
 import com.ogoglio.persist.ServiceInitializationPersistTasks;
 
@@ -33,10 +34,13 @@
 		configuration.setProperty("hibernate.connection.pool_size","1"); 
 		configuration.setProperty("hibernate.dialect","org.hibernate.dialect.HSQLDialect");
 		configuration.setProperty("hibernate.connection.shutdown","true");
+		String host = "10.0.1.198"; //best choice: 127.0.0.1
+		String siteInfo = "http://"+host+":8080/og"; //configured in server.xml
 		SessionFactory sessionFactory = configuration.buildSessionFactory();
 		try {
 			//new SchemaUpdate(configuration).execute(true,true);
-			ServiceInitializationPersistTasks.initializeLibraryAccount(sessionFactory);
+            ServiceInitializationPersistTasks.initializeLocalSim(new URI(siteInfo), sessionFactory);
+			ServiceInitializationPersistTasks.initializeLibraryAccount(sessionFactory,host);
 			sessionFactory.close();
 			System.out.println("Completed successfully. DB is now ready.");
 		} catch (Exception e) {

Modified: spaces/trunk/src/com/ogoglio/persist/ServiceInitializationPersistTasks.java
===================================================================
--- spaces/trunk/src/com/ogoglio/persist/ServiceInitializationPersistTasks.java	2007-07-01 18:46:57 UTC (rev 207)
+++ spaces/trunk/src/com/ogoglio/persist/ServiceInitializationPersistTasks.java	2007-07-01 20:25:27 UTC (rev 208)
@@ -40,13 +40,13 @@
         SimPersistTasks.createSim(LOCAL_SIM_DISPLAY_NAME, WebAPIClient.appendToURI(serviceURI, "sim/"), SimRecord.DEFAULT_EVENT_PORT, true, sessionFactory);
     }
 
-    public static void initializeLibraryAccount(SessionFactory sessionFactory) throws PersistException, IOException {
+    public static void initializeLibraryAccount(SessionFactory sessionFactory,String host) throws PersistException, IOException {
         AccountRecord accountRec = AccountPersistTasks.findAccountByUsername(LIBRARY_USERNAME, sessionFactory);
         if (accountRec != null) {
             return;
         }
 
-        accountRec = AccountPersistTasks.createAccount(LIBRARY_USERNAME, "admin", "library@127.0.0.1", sessionFactory);
+        accountRec = AccountPersistTasks.createAccount(LIBRARY_USERNAME, "admin", "library@"+host, sessionFactory);
         accountRec.setPassword(DEFAULT_LIBRARY_PASSWORD);
         AccountPersistTasks.update(accountRec, sessionFactory);
 

Modified: spaces/trunk/src/com/ogoglio/site/AccountServlet.java
===================================================================
--- spaces/trunk/src/com/ogoglio/site/AccountServlet.java	2007-07-01 18:46:57 UTC (rev 207)
+++ spaces/trunk/src/com/ogoglio/site/AccountServlet.java	2007-07-01 20:25:27 UTC (rev 208)
@@ -80,7 +80,7 @@
         super.init(config);
         try {
             ServiceInitializationPersistTasks.initializeLocalSim(new URI(getSiteInfo().getBaseUrl()), getSessionFactory());
-            ServiceInitializationPersistTasks.initializeLibraryAccount(getSessionFactory());
+            ServiceInitializationPersistTasks.initializeLibraryAccount(getSessionFactory(),getSiteInfo().getHost());
         } catch (PersistException e) {
             e.printStackTrace();
             throw new ServletException("Could not initialize service: " + e);

Modified: spaces/trunk/src/com/ogoglio/viewer/j3d/J3DRenderer.java
===================================================================
--- spaces/trunk/src/com/ogoglio/viewer/j3d/J3DRenderer.java	2007-07-01 18:46:57 UTC (rev 207)
+++ spaces/trunk/src/com/ogoglio/viewer/j3d/J3DRenderer.java	2007-07-01 20:25:27 UTC (rev 208)
@@ -821,8 +821,10 @@
         public double getLandHeight(double x, double z, double pickHeight) {
             pickStart.set(x, pickHeight, z);
             if (picker.pickRayClosest(pickStart, DOWN_VEC, intersectionPoint) == null) {
+            	//System.out.println("no land height: 0!");
                 return 0;
             }
+            //System.out.println("intersected with land: "+intersectionPoint.y);
             return intersectionPoint.y;
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.