Changeset 1851
- Timestamp:
- 11/07/08 21:09:49 (2 months ago)
- Files:
-
- drizzle/DrizzlePrp/random_info.txt (modified) (1 diff)
- drizzle/DrizzlePrp/src/automation/mystAutomation.java (modified) (4 diffs)
- drizzle/DrizzlePrp/src/gui/Gui.form (modified) (4 diffs)
- drizzle/DrizzlePrp/src/gui/Gui.java (modified) (7 diffs)
- drizzle/DrizzlePrp/src/shared/Quat.java (modified) (1 diff)
- drizzle/DrizzlePrp/src/uru/moulprp/ODEPhysical.java (deleted)
- drizzle/DrizzlePrp/src/uru/moulprp/PlDistOpacityMod.java (added)
- drizzle/DrizzlePrp/src/uru/moulprp/PlHKPhysical.java (modified) (6 diffs)
- drizzle/DrizzlePrp/src/uru/moulprp/PlMaintainersMarkerModifier.java (added)
- drizzle/DrizzlePrp/src/uru/moulprp/PlODEPhysical.java (added)
- drizzle/DrizzlePrp/src/uru/moulprp/PrpObject.java (modified) (1 diff)
- drizzle/DrizzlePrp/src/uru/moulprp/Typeid.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
drizzle/DrizzlePrp/random_info.txt
r1822 r1851 68 68 OnClimbingBlockerEvent 69 69 70 Kirel cone problem info: 71 ------------------------ 72 moul 73 mass=8 74 rc=1 75 el=0 76 pos= ~ 426,-802,9 77 orient = 0,0,0,1 70 78 79 pots 80 pos= ~ 426,-802,9 81 orient= 1,0,0,0 82 mass=15 83 rc=1 84 el=0 85 86 Changing the quat around didn't seem to fix it. 87 Perhaps it's a difference between havok and physx, and the cones were changed to cut down on network traffic. drizzle/DrizzlePrp/src/automation/mystAutomation.java
r1842 r1851 667 667 type.plLayerSDLAnimation, 668 668 669 type.plMaintainersMarkerModifier, 670 type.plDistOpacityMod, 671 669 672 }; 670 673 namestartswith = new String[]{ … … 827 830 828 831 Typeid.pfGUIDragBarCtrl, 832 833 Typeid.plMaintainersMarkerModifier, 834 Typeid.plDistOpacityMod, 829 835 }; 830 836 … … 1001 1007 type.plPostEffectMod, 1002 1008 type.pfGUIDragBarCtrl, 1009 1010 type.plMaintainersMarkerModifier, 1011 type.plDistOpacityMod, 1003 1012 }; 1004 1013 String[] namestarts={ … … 1018 1027 prefices.put("Neighborhood02",86); 1019 1028 prefices.put("Personal",85); 1029 prefices.put("GreatTreePub",84); 1020 1030 1021 1031 HashMap<String, String> agenames = new HashMap<String, String>(); drizzle/DrizzlePrp/src/gui/Gui.form
r1850 r1851 449 449 <Group type="102" attributes="0"> 450 450 <Group type="103" groupAlignment="0" attributes="0"> 451 <Component id="textfieldState3" pref="43 3" max="32767" attributes="0"/>451 <Component id="textfieldState3" pref="437" max="32767" attributes="0"/> 452 452 <Group type="102" alignment="0" attributes="0"> 453 453 <EmptySpace max="-2" attributes="0"/> … … 1305 1305 <EmptySpace min="-2" pref="114" max="-2" attributes="0"/> 1306 1306 <Group type="103" groupAlignment="0" attributes="0"> 1307 <Component id="checkboxState22" alignment="0" min="-2" max="-2" attributes="0"/> 1307 1308 <Component id="checkboxState20" alignment="0" min="-2" max="-2" attributes="0"/> 1308 1309 <Component id="checkboxState19" alignment="0" min="-2" max="-2" attributes="0"/> … … 1334 1335 <EmptySpace max="-2" attributes="0"/> 1335 1336 <Component id="checkboxState20" min="-2" max="-2" attributes="0"/> 1336 <EmptySpace pref="82" max="32767" attributes="0"/> 1337 <EmptySpace max="-2" attributes="0"/> 1338 <Component id="checkboxState22" min="-2" max="-2" attributes="0"/> 1339 <EmptySpace pref="48" max="32767" attributes="0"/> 1337 1340 </Group> 1338 1341 </Group> … … 1384 1387 <Property name="text" type="java.lang.String" value="Do automated work on Myst5(PythonFileMods, etc)"/> 1385 1388 <Property name="name" type="java.lang.String" value="automateMystV" noResource="true"/> 1389 </Properties> 1390 </Component> 1391 <Component class="shared.State.CheckboxState" name="checkboxState22"> 1392 <Properties> 1393 <Property name="text" type="java.lang.String" value="Use xyzw for PlPXPhysical orientation."/> 1394 <Property name="name" type="java.lang.String" value="plpxphysicalQuatChange" noResource="true"/> 1386 1395 </Properties> 1387 1396 </Component> drizzle/DrizzlePrp/src/gui/Gui.java
r1850 r1851 77 77 "Personal_District_psnlMYSTII.prp", 78 78 "AhnySphere01_District_Sphere01.prp", 79 "Neighborhood02_District_krelKirel.prp", 79 80 }; 80 81 public int getSize() { … … 124 125 "Kveer.age","Kveer.fni","Kveer.sum","Kveer_District_BuiltIn.prp","Kveer_District_KveerHalls.prp","Kveer_District_Textures.prp", 125 126 "Personal.age","Personal.fni","Personal.sum","Personal_District_BuiltIn.prp","Personal_District_psnlMYSTII.prp","Personal_District_Textures.prp", 127 "GreatTreePub.age","GreatTreePub.fni","GreatTreePub.sum","GreatTreePub_District_BuiltIn.prp","GreatTreePub_District_GreatTree.prp","GreatTreePub_District_Pub.prp","GreatTreePub_District_Textures.prp", 128 "Neighborhood02.age","Neighborhood02.fni","Neighborhood02.sum","Neighborhood02_District_BuiltIn.prp","Neighborhood02_District_GuildInfo-Cartographers.prp","Neighborhood02_District_GuildInfo-Greeters.prp","Neighborhood02_District_GuildInfo-Maintainers.prp","Neighborhood02_District_GuildInfo-Messengers.prp","Neighborhood02_District_GuildInfo-Writers.prp","Neighborhood02_District_krelClassRm.prp","Neighborhood02_District_krelCommonRm.prp","Neighborhood02_District_krelKirel.prp","Neighborhood02_District_krelPrivateRm.prp","Neighborhood02_District_Textures.prp", 126 129 }; 127 130 public int getSize() { … … 473 476 checkboxState19 = new shared.State.CheckboxState(); 474 477 checkboxState20 = new shared.State.CheckboxState(); 478 checkboxState22 = new shared.State.CheckboxState(); 475 479 jPanel23 = new javax.swing.JPanel(); 476 480 jButton90 = new javax.swing.JButton(); … … 1356 1360 checkboxState20.setName("automateMystV"); // NOI18N 1357 1361 1362 checkboxState22.setText("Use xyzw for PlPXPhysical orientation."); 1363 checkboxState22.setName("plpxphysicalQuatChange"); // NOI18N 1364 1358 1365 javax.swing.GroupLayout jPanel20Layout = new javax.swing.GroupLayout(jPanel20); 1359 1366 jPanel20.setLayout(jPanel20Layout); … … 1363 1370 .addGap(114, 114, 114) 1364 1371 .addGroup(jPanel20Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 1372 .addComponent(checkboxState22, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) 1365 1373 .addComponent(checkboxState20, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) 1366 1374 .addComponent(checkboxState19, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) … … 1389 1397 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 1390 1398 .addComponent(checkboxState20, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) 1391 .addContainerGap(82, Short.MAX_VALUE)) 1399 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 1400 .addComponent(checkboxState22, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) 1401 .addContainerGap(48, Short.MAX_VALUE)) 1392 1402 ); 1393 1403 … … 4223 4233 private shared.State.CheckboxState checkboxState20; 4224 4234 private shared.State.CheckboxState checkboxState21; 4235 private shared.State.CheckboxState checkboxState22; 4225 4236 private shared.State.CheckboxState checkboxState3; 4226 4237 private shared.State.CheckboxState checkboxState4; drizzle/DrizzlePrp/src/shared/Quat.java
r1842 r1851 43 43 y = new Flt(c); 44 44 z = new Flt(c); 45 } 46 private Quat(){} 47 public static Quat readXYZW(IBytestream c) 48 { 49 Quat result = new Quat(); 50 result.x = new Flt(c); 51 result.y = new Flt(c); 52 result.z = new Flt(c); 53 result.w = new Flt(c); 54 return result; 45 55 } 46 56 public Quat(context c) //deprecated drizzle/DrizzlePrp/src/uru/moulprp/PlHKPhysical.java
r1842 r1851 46 46 47 47 //plODEPHysical 48 public ODEPhysical ode;48 public PlODEPhysical ode; 49 49 50 50 public static potsflags convertMoulFlagsToPotsFlags(moulflags moul, String objname) … … 249 249 pots.zzzgroup0 = 0x4; 250 250 251 } 252 else if(( u14==0x0 && u15==0x0 && LOSDB==0x1 && group0==0x4 ) 253 ||( u14==0x0 && u15==0x0 && LOSDB==0x5 && group0==0x4 )) 254 { 255 //seen in GreatTreePub, works, e.g. clock that moves up when you approach it from the other side. 256 pots.zzzu1 = 0x0; 257 pots.zzzcoltype = 0x400; 258 pots.zzzflagsdetect = 0x0; 259 pots.zzzflagsrespond = 0x1020000; 260 pots.zzzu2 = 0x0; 261 pots.zzzu3 = 0x0; 262 pots.zzzLOSDB = LOSDB; 263 pots.zzzgroup0 = 0x4; 264 } 265 else if( u14==0x6 && u15==0x0 && LOSDB==0x4 && group0==0x120 ) 266 { 267 //seen in Kirel 268 pots.zzzu1 = 0x0; 269 pots.zzzcoltype = 0x0; 270 pots.zzzflagsdetect = 0x0; 271 pots.zzzflagsrespond = 0x0; 272 pots.zzzu2 = 0x0; 273 pots.zzzu3 = 0x0; 274 pots.zzzLOSDB = 0x4; 275 pots.zzzgroup0 = 0x104; 251 276 } 252 277 else … … 320 345 { 321 346 _version = 4; 322 ode = new ODEPhysical(c);347 ode = new PlODEPhysical(c); 323 348 } 324 349 else if(c.readversion==3) … … 373 398 public PXPhysical(context c) throws readexception 374 399 { 375 if(c.curRootObject.objectname.toString().toLowerCase().startsWith(" swimdetectregion"))400 if(c.curRootObject.objectname.toString().toLowerCase().startsWith("kirelorange")) 376 401 { 377 402 int dummy=0; … … 410 435 // dummy=0; 411 436 position = new Vertex(c); //position? 412 orientation = new Quat(c); //orientation? 437 438 if(shared.State.AllStates.getStateAsBoolean("plpxphysicalQuatChange")) 439 { 440 orientation = Quat.readXYZW(c.in); 441 m.warn("Using new Quat form in PlPXPhysical, if you have problems with physics, try reverting it."); 442 } 443 else 444 { 445 orientation = new Quat(c); //orientation? 446 } 447 413 448 group = new HsBitVector(c); //{0} //like u4? 414 449 /*if(group.count!=1) … … 639 674 public HKPhysical(context c) throws readexception 640 675 { 676 if(c.curRootObject.objectname.toString().toLowerCase().startsWith("kirelorange")) 677 { 678 int dummy=0; 679 } 641 680 parent = new PlSynchedObject(c); 642 681 position = new Vertex(c); drizzle/DrizzlePrp/src/uru/moulprp/PrpObject.java
r1816 r1851 332 332 case pfGUIDragBarCtrl: 333 333 return new PfGUIButtonMod.PfGUIDragBarCtrl(c); 334 case plMaintainersMarkerModifier: 335 return new PlMaintainersMarkerModifier(c); 336 case plDistOpacityMod: 337 return new PlDistOpacityMod(c); 334 338 default: 335 339 //m.err("prprootobject: unhandled type."); drizzle/DrizzlePrp/src/uru/moulprp/Typeid.java
r1834 r1851 248 248 pfGUIRadioGroupCtrl, 249 249 pfGUIPopUpMenu, 250 251 //GreatTreePub 252 plMaintainersMarkerModifier, 253 //Kirel 254 plDistOpacityMod, 250 255 251 256 plLeafController, … … 465 470 tri( 0x119, -2, -2, pfGUIPopUpMenu), 466 471 472 tri( 0x10D, 0x10D, -2, plMaintainersMarkerModifier), 473 tri( 0x131, 0x131, -2, plDistOpacityMod), 467 474 468 475 tri( 0x8000, 0x8000, 0x8000, nil ),
