simspark-cvs — CVS Commit Notifications via Email

[simspark-cvs] simspark/contrib/plugin/soccer soccer.vcproj, 1.1.2.1, 1.1.2.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3024

Modified Files:
      Tag: WIN32
	soccer.vcproj 
Log Message:
- fix release build

Index: soccer.vcproj
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/plugin/soccer/Attic/soccer.vcproj,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** soccer.vcproj	18 Feb 2007 12:54:56 -0000	1.1.2.1
--- soccer.vcproj	18 Feb 2007 13:08:19 -0000	1.1.2.2
***************
*** 118,122 ****
  			<Tool
  				Name="VCCLCompilerTool"
! 				AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
  				RuntimeLibrary="2"
--- 118,122 ----
  			<Tool
  				Name="VCCLCompilerTool"
! 				AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility;..\"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
  				RuntimeLibrary="2"
***************
*** 137,141 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="msvcrt-ruby18.lib"
  				LinkIncremental="1"
  				GenerateDebugInformation="true"
--- 137,141 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="msvcrt-ruby18.lib ode.lib"
  				LinkIncremental="1"
  				GenerateDebugInformation="true"

[simspark-cvs] simspark/simulations/parts/rsg agent.rb, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/simulations/parts/rsg
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31978

Added Files:
      Tag: WIN32
	agent.rb 
Log Message:
- startup script for hoap2 test

--- NEW FILE: agent.rb ---
#
# test the hoap2 robot
#

# hoap2 depends on the soccer bundle
importBundle('soccer')

scene = get($scenePath)
scene.importScene('rsg/boxspheres/arena.rsg')
scene.importScene('rsg/agent/hoap2.rsg')

[simspark-cvs] simspark/simulations/parts/rsg/agent hoap2.rsg, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/simulations/parts/rsg/agent
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31950

Added Files:
      Tag: WIN32
	hoap2.rsg 
Log Message:
- add the hoap 2 bot

--- NEW FILE: hoap2.rsg ---
; -*- mode: lisp; -*-

;
; approximation of the Fujitsu Hoap-2 robot
;

(RubySceneGraph 0 1)
( 
    ;
    ; define constants for the robot parts
    ;

    ; feet
    (define $FootLength 0.6)
    (define $FootWidth 0.956)
    (define $FootHeight 0.095)
    (define $FootMass 0.1)

    ; static box at the ankles
    (define $AnkleBoxLength 0.355)
    (define $AnkleBoxWidth 0.143)
    (define $AnkleBoxHeight 0.476)

    ; shanks
    (define $ShankLength 0.56)
    (define $ShankWidth 0.56)
    (define $ShankHeight 0.964)
    (define $ShankMass 0.25)

    ; thighs
    (define $ThighLength 0.56)
    (define $ThighWidth 0.56)
    (define $ThighHeight 1.3)
    (define $ThighMass 0.25)

    ; hips
    (define $HipLength 0.273)
    (define $HipWidth 0.273)
    (define $HipHeight 0.2)
    (define $HipMass 0.1)

    ; hand1
    (define $HandBox1Length 0.082)
    (define $HandBox1Width 0.272) 
    (define $HandBox1Height 0.57)

    ; hand2
    (define $HandBox2Length 0.242)
    (define $HandBox2Width 0.272)
    (define $HandBox2Height 0.164)

    ; hand3
    (define $HandBox3Length 0.074)
    (define $HandBox3Width 0.272)
    (define $HandBox3Height 0.2)

    ; lower arms
    (define $LowerarmLength 0.445)
    (define $LowerarmWidth 0.316)
    (define $LowerarmHeight 0.6)
    (define $LowerarmMass 0.2)

    ; elbows
    (define $ElbowDirection 1)
    (define $ElbowRadius 0.134)
    (define $ElbowLength 0.3)

    ; upper arms
    (define $UpperarmLength 0.445)
    (define $UpperarmWidth 0.398)
    (define $UpperarmHeight 0.506)
    (define $UpperarmMass 0.2)

    ; shoulders
    (define $ShoulderLength 0.445)
    (define $ShoulderWidth 1.017)
    (define $ShoulderHeight 0.536)
    (define $ShoulderMass 0.5) 

    ; head
    (define $HeadRadius 0.39)
    (define $HeadMass 0.3)

    ; neck
    (define $NeckLength 0.2)
    (define $NeckWidth 0.2)
    (define $NeckHeight 0.4)
    (define $NeckMass 0.1)

    ; torso1
    (define $TorsoBox1Length 1.37)
    (define $TorsoBox1Width 0.96)
    (define $TorsoBox1Height 1.41)
    (define $TorsoBox1Mass 1.8)

    ; torso2
    (define $TorsoBox2Length 1.37)
    (define $TorsoBox2Width 0.54)
    (define $TorsoBox2Height 1.81)
    (define $TorsoBox2Mass 1.8)

    (define $TorsoCylinderDirection 1)   ; oriented along x-axis
    (define $TorsoCylinderRadius 0.1)
    (define $TorsoCylinderLength 0.3)

    ;
    ; assemble the robot
    ;

    ; torso position (absolute)
    (define $TorsoPosX 0)
    (define $TorsoPosY 0)
    (define $TorsoPosZ 3.5)

    ; calculate offset of the battery pack
    (define $offsetTorsoBox2X 0.0)
    (define $offsetTorsoBox2Y (eval -1 * (eval (eval $TorsoBox1Width / 2.0) + (eval $TorsoBox2Width / 2.0))))
    (define $offsetTorsoBox2Z (eval -1 * (eval (eval $TorsoBox1Height / 2.0) - (eval $TorsoBox2Height / 2.0))))

    ; calculate offset for the left shoulder cylinder
    (define $offsetLeftShoulderCylX (eval -1 * (eval $TorsoBox1Length / 2.0)))
    (define $offsetLeftShoulderCylY 0.0)
    (define $offsetLeftShoulderCylZ (eval (eval $TorsoBox1Height / 2.0) - (eval $ShoulderHeight / 2.0)))
 
    ; calculate offset for the right shoulder cylinder
    (define $offsetRightShoulderCylX (eval $TorsoBox1Length / 2.0))
    (define $offsetRightShoulderCylY 0.0)
    (define $offsetRightShoulderCylZ (eval (eval $TorsoBox1Height / 2.0) - (eval $ShoulderHeight / 2.0)))

    ; create the torso
    (node AgentAspect
        (setName body)
        (setLocalPos $TorsoPosX $TorsoPosY $TorsoPosZ)
        (importScene rsg/boxspheres/box.rsg $TorsoBox1Length $TorsoBox1Width $TorsoBox1Height $TorsoBox1Mass matGrey)

	; install a node holding agent state data
        (node AgentState
	     (setName AgentState)
	)

	; static cylinders for the shoulders
	(node Transform
	     (setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
	     (setLocalRotation 0 90 0)
	     (node CCylinder
		   (setMaterial matGrey)
		   (setParams $TorsoCylinderRadius $TorsoCylinderLength)
	     )
	)
	
	(node Transform
	     (setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
	     (setLocalRotation 0 90 0)
	     (node CCylinder
		   (setMaterial matGrey)
		   (setParams $TorsoCylinderRadius $TorsoCylinderLength)
	     )
	)
    )
	
    ;;; DEBUG
    ;(node FixedJoint
	;  (attach ../body/boxBody 0) ; attach to the static environment
	;  (setFixed)
    ;)
    
    ; add battery backpack
    (node Transform
	(setName battery)
	(setLocalPos (eval $TorsoPosX + $offsetTorsoBox2X) (eval $TorsoPosY + $offsetTorsoBox2Y + 0.01) (eval $TorsoPosZ + $offsetTorsoBox2Z))
	(importScene rsg/boxspheres/box.rsg $TorsoBox2Length $TorsoBox2Width $TorsoBox2Height $TorsoBox2Mass matGrey)

	; +++
	; THIS IS A HACK SINCE WE DON'T HAVE COMPOUND OBJECTS YET !
	; +++

	; install hinge joint to connect to the torso
        (node HingeJoint
            (attach ../boxBody ../../body/boxBody)
            (setAnchor 0.0 0.0 0.0)   
            (setAxis 2) ; move around z-axis
	    (setLowStopDeg 0 0.01)
	    (setHighStopDeg 0 0.01)
	)
    )

    ;;; -------------------------------------
    ;;; HEAD
    ;;; -------------------------------------
    
    ; attach neck
    (node Transform
        (setName neck)
        (setLocalPos $TorsoPosX (eval $TorsoPosY - 0.1) (eval $TorsoPosZ + (eval $TorsoBox1Height / 2.0) + (eval $NeckHeight / 2.0)))
        (importScene rsg/boxspheres/box.rsg $NeckLength $NeckWidth $NeckHeight $NeckMass matGrey)

        ; install hinge joint to connect to the torso
        (node HingeJoint
            (attach ../boxBody ../../body/boxBody)
            (setAnchor $TorsoPosX (eval $TorsoPosY - 0.1) (eval $TorsoPosZ + (eval $TorsoBox1Height / 2.0)))   
            (setAxis 2) ; move around z-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName head_joint_2)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName head_eff_2)
            )
        )
    )

    ; attach head
    (node Transform
        (setName head)
        (setLocalPos $TorsoPosX 
		     (eval $TorsoPosY + 0.05) 
		     (eval $TorsoPosZ + (eval $TorsoBox1Height / 2.0) + (eval $NeckHeight / 2.0) + (eval $HeadRadius / 2.0)))
        (importScene rsg/boxspheres/sphere.rsg $HeadRadius $HeadMass matLightBlue)

        ; install hinge joint to connect to the neck
        (node HingeJoint
            (attach ../sphereBody ../../neck/boxBody)
            (setAnchor $TorsoPosX (eval $TorsoPosY - 0.1) (eval $TorsoPosZ + (eval $TorsoBox1Height / 2.0) + $NeckHeight))
            (setAxis 0) ; move around the x-axis

            ; enable the joint motor
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName head_joint_1)
            )

            ; install an effector to control the joint motor
            (node HingeEffector
                (setName head_eff_1)
            )
        )
    )

    ;;; -------------------------------------
    ;;; ARMS
    ;;; -------------------------------------

    (define $LeftShoulderPosX (eval $TorsoPosX - 
				    (eval $TorsoBox1Length / 2.0) - 
				    (eval $ShoulderLength / 2.0) - 
				    (eval $TorsoCylinderLength / 2.0)
			       )
    )
    (define $LeftShoulderPosY $TorsoPosY)
    (define $LeftShoulderPosZ (eval $TorsoPosZ + 
				    (eval $TorsoBox1Height / 2.0) -
				    (eval $ShoulderHeight / 2.0)
			       )
    )

    (define $RightShoulderPosX (eval $TorsoPosX +
				    (eval $TorsoBox1Length / 2.0) + 
				    (eval $ShoulderLength / 2.0) + 
				    (eval $TorsoCylinderLength / 2.0)
			       )
    )
    (define $RightShoulderPosY $TorsoPosY)
    (define $RightShoulderPosZ $LeftShoulderPosZ)
 
    ; left shoulder
    (node Transform
        (setName leftshoulder)
        (setLocalPos $LeftShoulderPosX $LeftShoulderPosY $LeftShoulderPosZ)
        (importScene rsg/boxspheres/box.rsg $ShoulderLength $ShoulderWidth $ShoulderHeight $ShoulderMass matGrey)

        ; install universal joint to connect to the torso
        (node UniversalJoint
            (attach ../boxBody ../../body/boxBody)
            (setAnchor 0.0 0.0 0.0)   
            (setAxis1 1.0 0.0 0.0) ; move around the x-axis
            (setAxis2 0.0 1.0 0.0) ; move around the y-axis

            ; enable the joint motors
            (setMaxMotorForce 0 100)
            (setMaxMotorForce 1 100)           

            ; install a perceptor
            (node UniversalJointPerceptor
                (setName larm_joint_1_2)
            )

            ; install an effector to control the joint motors
            (node UniversalJointEffector
                (setName larm_eff_1_2)
            )
        )
    )

    ; right shoulder
    (node Transform
        (setName rightshoulder)
        (setLocalPos $RightShoulderPosX $RightShoulderPosY $RightShoulderPosZ)
        (importScene rsg/boxspheres/box.rsg $ShoulderLength $ShoulderWidth $ShoulderHeight $ShoulderMass matGrey)
        (setLocalRotation 0 0 180)

            ; install universal joint to connect to the torso
	    (node UniversalJoint		
                (attach ../boxBody ../../body/boxBody)
		(setAnchor 0.0 0.0 0.0)  
		(setAxis1 1.0 0.0 0.0) ; move around the x-axis
		(setAxis2 0.0 1.0 0.0) ; move around the y-axis

                ; enable the joint motors
		(setMaxMotorForce 0 100)
		(setMaxMotorForce 1 100)           

                ; install a perceptor
                (node UniversalJointPerceptor
                    (setName rarm_joint_1_2)
		)

                ; install an effector to control the joint motors
                (node UniversalJointEffector
                    (setName rarm_eff_1_2)
                )
            )
    )

    (define $LeftUpperArmPosX $LeftShoulderPosX)
    (define $LeftUpperArmPosY (eval $LeftShoulderPosY + (eval $UpperarmWidth / 2.0)))
    (define $LeftUpperArmPosZ (eval $LeftShoulderPosZ - (eval $ShoulderHeight / 2.0) - (eval $UpperarmHeight / 2.0)))

    (define $RightUpperArmPosX $RightShoulderPosX)
    (define $RightUpperArmPosY (eval $RightShoulderPosY + (eval $UpperarmWidth / 2.0)))
    (define $RightUpperArmPosZ (eval $RightShoulderPosZ - (eval $ShoulderHeight / 2.0) - (eval $UpperarmHeight / 2.0)))
    
    ; left upper arm
    (node Transform
        (setName leftupperarm)
        (setLocalPos $LeftUpperArmPosX $LeftUpperArmPosY $LeftUpperArmPosZ)
        (importScene rsg/boxspheres/box.rsg $UpperarmLength $UpperarmWidth $UpperarmHeight $UpperarmMass matGrey)

        ; install hinge joint to connect to the shoulder
        (node HingeJoint
            (attach ../boxBody ../../leftshoulder/boxBody)
            (setAnchor 0.0 0.0 (eval $UpperarmHeight / 2.0))   
            (setAxis 2) ; move around z-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName larm_joint_3)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName larm_eff_3)
            )
        )

	; static cylinder for the elbow
	(node Transform
	     (setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
	     (setLocalRotation 0 90 0)
	     (node CCylinder
		   (setMaterial matGrey)
		   (setParams $ElbowRadius $ElbowLength)
	     )
	)
    )

    ; right upper arm
    (node Transform
        (setName rightupperarm)
        (setLocalPos $RightUpperArmPosX $RightUpperArmPosY $RightUpperArmPosZ)
	(importScene rsg/boxspheres/box.rsg $UpperarmLength $UpperarmWidth $UpperarmHeight $UpperarmMass matGrey)
	
        ; install hinge joint to connect to the shoulder
        (node HingeJoint
            (attach ../boxBody ../../rightshoulder/boxBody)
            (setAnchor 0 0 (eval $UpperarmHeight / 2.0))   
            (setAxis 2) ; move around z-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName rarm_joint_3)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName rarm_eff_3)
            )
        )

	; static cylinder for the elbow
	(node Transform
	     (setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
	     (setLocalRotation 0 90 0)
	     (node CCylinder
		   (setMaterial matGrey)
		   (setParams $ElbowRadius $ElbowLength)
	     )
	)
    )

    (define $LeftLowerArmPosX $LeftUpperArmPosX)
    (define $LeftLowerArmPosY $LeftUpperArmPosY)
    (define $LeftLowerArmPosZ (eval $LeftUpperArmPosZ -
				    (eval $UpperarmHeight / 2.0) -
				    $ElbowRadius -
				    (eval $LowerarmHeight / 2.0)
			       )
     )

    (define $RightLowerArmPosX $RightUpperArmPosX)
    (define $RightLowerArmPosY $RightUpperArmPosY)
    (define $RightLowerArmPosZ (eval $RightUpperArmPosZ -
				    (eval $UpperarmHeight / 2.0) -
				    $ElbowRadius -
				    (eval $LowerarmHeight / 2.0)
			       )
     )

    ; left lower arm
    (node Transform
        (setName leftlowerarm)
        (setLocalPos $LeftLowerArmPosX $LeftLowerArmPosY $LeftLowerArmPosZ)
        (importScene rsg/boxspheres/box.rsg $LowerarmLength $LowerarmWidth $LowerarmHeight $LowerarmMass matGrey)

        ; install hinge joint to connect to the upper arm
        (node HingeJoint
            (attach ../boxBody ../../leftupperarm/boxBody)
            (setAnchor 0 0 (eval $LowerarmHeight / 2.0))   
            (setAxis 0) ; move around x-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName larm_joint_4)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName larm_eff_4)
            )
        )

	; static hand
	(node Transform
	     (setLocalPos (eval -1 * (eval (eval $LowerarmLength / 2.0) - (eval $HandBox1Length / 2.0) - 0.06))
			  0.0
			  (eval -1 * (eval (eval $LowerarmHeight / 2.0) + (eval $HandBox1Height / 2.0)))
	      )
	     (node Box
		   (setMaterial matGrey)
		   (setExtents $HandBox1Length $HandBox1Width $HandBox1Height)
	     )	     
        )
	
	(node Transform
	     (setLocalPos (eval (eval $LowerarmLength / 2.0) - (eval $HandBox2Length / 2.0) - 0.06)
			  0.0
			  (eval -1 * (eval (eval $LowerarmHeight / 2.0) + (eval $HandBox2Height / 2.0)))
	      )
	     (node Box
		   (setMaterial matGrey)
		   (setExtents $HandBox2Length $HandBox2Width $HandBox2Height)
	     )
	)

	(node Transform
	     (setLocalPos (eval (eval $LowerarmLength / 2.0) - (eval $HandBox3Length / 2.0) - 0.06)
			  0.0
			  (eval -1 * (eval (eval $LowerarmHeight / 2.0) + $HandBox2Height + (eval $HandBox3Height / 2.0)))
	      )
	     (node Box
		   (setMaterial matGrey)
		   (setExtents $HandBox3Length $HandBox3Width $HandBox3Width)
	     )
	)
    )

    ; right lower arm
    (node Transform
        (setName rightlowerarm)
        (setLocalPos $RightLowerArmPosX $RightLowerArmPosY $RightLowerArmPosZ)
	;(setLocalRotation 0 0 180)
        (importScene rsg/boxspheres/box.rsg $LowerarmLength $LowerarmWidth $LowerarmHeight $LowerarmMass matGrey)

        ; install hinge joint to connect to the upper arm
        (node HingeJoint
            (attach ../boxBody ../../rightupperarm/boxBody)
            (setAnchor 0 0 (eval $LowerarmHeight / 2.0))   
            (setAxis 0) ; move around x-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName rarm_joint_4)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName rarm_eff_4)
            )
        )

	; static hand
	(node Transform
	      (setLocalRotation 0 0 180)
	      
	      (node Transform
		    (setLocalPos (eval -1 * (eval (eval $LowerarmLength / 2.0) - (eval $HandBox1Length / 2.0) - 0.06))
				 0.0
				 (eval -1 * (eval (eval $LowerarmHeight / 2.0) + (eval $HandBox1Height / 2.0)))
				 )
		    (node Box
			  (setMaterial matGrey)
			  (setExtents $HandBox1Length $HandBox1Width $HandBox1Height)
			  )	     
		    )
	      
	      (node Transform
		    (setLocalPos (eval (eval $LowerarmLength / 2.0) - (eval $HandBox2Length / 2.0) - 0.06)
				 0.0
				 (eval -1 * (eval (eval $LowerarmHeight / 2.0) + (eval $HandBox2Height / 2.0)))
				 )
		    (node Box
			  (setMaterial matGrey)
			  (setExtents $HandBox2Length $HandBox2Width $HandBox2Height)
			  )
		    )
	      
	      (node Transform
		    (setLocalPos (eval (eval $LowerarmLength / 2.0) - (eval $HandBox3Length / 2.0) - 0.06)
				 0.0
				 (eval -1 * (eval (eval $LowerarmHeight / 2.0) + $HandBox2Height + (eval $HandBox3Height / 2.0)))
				 )
		    (node Box
			  (setMaterial matGrey)
			  (setExtents $HandBox3Length $HandBox3Width $HandBox3Width)
			  )
		    )
	)
    )

    ;;; -------------------------------------
    ;;; LEGS
    ;;; -------------------------------------
    
    (define $LeftHipPosX (eval $TorsoPosX - (eval $TorsoBox1Length / 4.0) - 0.06))
    (define $LeftHipPosY $TorsoPosY)
    (define $LeftHipPosZ (eval $TorsoPosZ - (eval $TorsoBox1Height / 2.0) - (eval $HipHeight / 2.0)))

    (define $RightHipPosX (eval $TorsoPosX + (eval $TorsoBox1Length / 4.0) + 0.06))
    (define $RightHipPosY $TorsoPosY)
    (define $RightHipPosZ (eval $TorsoPosZ - (eval $TorsoBox1Height / 2.0) - (eval $HipHeight / 2.0)))


    ; left hip
    (node Transform
        (setName lefthip)
        (setLocalPos $LeftHipPosX $LeftHipPosY $LeftHipPosZ)
        (importScene rsg/boxspheres/box.rsg $HipLength $HipWidth $HipHeight $HipMass matGrey)

        ; install hinge joint to connect to the torso
        (node HingeJoint
            (attach ../boxBody ../../body/boxBody)
            (setAnchor 0 0 (eval $HipHeight / 2.0))   
            (setAxis 2) ; move around z-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName lleg_joint_1)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName lleg_eff_1)
            )
        )
    )

    ; right hip
    (node Transform
        (setName righthip)
        (setLocalPos $RightHipPosX $RightHipPosY $RightHipPosZ)
        (importScene rsg/boxspheres/box.rsg $HipLength $HipWidth $HipHeight $HipMass matGrey)

        ; install hinge joint to connect to the torso
        (node HingeJoint
            (attach ../boxBody ../../body/boxBody)
            (setAnchor 0 0 (eval $HipHeight / 2.0))   
            (setAxis 2) ; move around z-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName rleg_joint_1)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName rleg_eff_1)
            )
        )
    )

    (define $LeftThighPosX $LeftHipPosX)
    (define $LeftThighPosY $LeftHipPosY)
    (define $LeftThighPosZ (eval $LeftHipPosZ - (eval $HipHeight / 2.0) - (eval $ThighHeight / 2.0)))

    (define $RightThighPosX $RightHipPosX)
    (define $RightThighPosY $RightHipPosY)
    (define $RightThighPosZ (eval $RightHipPosZ - (eval $HipHeight / 2.0) - (eval $ThighHeight / 2.0)))

    ; left thigh
    (node Transform
        (setName leftthigh)
        (setLocalPos $LeftThighPosX $LeftThighPosY $LeftThighPosZ)
        (importScene rsg/boxspheres/box.rsg $ThighLength $ThighWidth $ThighHeight $ThighMass matGrey)

        ; install hinge joint to connect to the torso
        (node UniversalJoint
            (attach ../boxBody ../../lefthip/boxBody)
            (setAnchor 0.0 0.0 (eval $ThighHeight / 2.0))   
            (setAxis1 1.0 0.0 0.0) ; move around the x-axis
            (setAxis2 0.0 1.0 0.0) ; move around the y-axis

            ; enable the joint motors
            (setMaxMotorForce 0 100)
            (setMaxMotorForce 1 100)           

            ; install a perceptor
            (node UniversalJointPerceptor
                (setName lleg_joint_2_3)
            )

            ; install an effector to control the joint motors
            (node UniversalJointEffector
                (setName lleg_eff_2_3)
            )
        )
    )

    ; right thigh
    (node Transform
        (setName rightthigh)
        (setLocalPos $RightThighPosX $RightThighPosY $RightThighPosZ)
        (importScene rsg/boxspheres/box.rsg $ThighLength $ThighWidth $ThighHeight $ThighMass matGrey)

        ; install hinge joint to connect to the torso
        (node UniversalJoint
            (attach ../boxBody ../../righthip/boxBody)
            (setAnchor 0.0 0.0 (eval $ThighHeight / 2.0))   
            (setAxis1 1.0 0.0 0.0) ; move around the x-axis
            (setAxis2 0.0 1.0 0.0) ; move around the y-axis

            ; enable the joint motors
            (setMaxMotorForce 0 100)
            (setMaxMotorForce 1 100)           

            ; install a perceptor
            (node UniversalJointPerceptor
                (setName rleg_joint_2_3)
            )

            ; install an effector to control the joint motors
            (node UniversalJointEffector
                (setName rleg_eff_2_3)
            )
        )
    )

    (define $LeftShankPosX $LeftThighPosX)
    (define $LeftShankPosY $LeftThighPosY)
    (define $LeftShankPosZ (eval $LeftThighPosZ - (eval $ThighHeight / 2.0) - (eval $ShankHeight / 2.0) - 0.05))

    (define $RightShankPosX $RightThighPosX)
    (define $RightShankPosY $RightThighPosY)
    (define $RightShankPosZ (eval $RightThighPosZ - (eval $ThighHeight / 2.0) - (eval $ShankHeight / 2.0) - 0.05))

    ; left shank
    (node Transform
        (setName leftshank)
        (setLocalPos $LeftShankPosX $LeftShankPosY $LeftShankPosZ)
        (importScene rsg/boxspheres/box.rsg $ShankLength $ShankWidth $ShankHeight $ShankMass matGrey)

        ; install hinge joint to connect to the thigh
        (node HingeJoint
            (attach ../boxBody ../../leftthigh/boxBody)
            (setAnchor 0.0 0.0 (eval $ShankHeight / 2.0))   
            (setAxis 0) ; move around x-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName lleg_joint_4)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName lleg_eff_4)
            )
        )
    )

    ; right shank
    (node Transform
        (setName rightshank)
        (setLocalPos $RightShankPosX $RightShankPosY $RightShankPosZ)
        (importScene rsg/boxspheres/box.rsg $ShankLength $ShankWidth $ShankHeight $ShankMass matGrey)

        ; install hinge joint to connect to the thigh
        (node HingeJoint
            (attach ../boxBody ../../rightthigh/boxBody)
            (setAnchor 0.0 0.0 (eval $ShankHeight / 2.0))
            (setAxis 0) ; move around x-axis
            
            ; enable the joint motors
            (setMaxMotorForce 0 100)

            ; install a perceptor
            (node HingePerceptor
                (setName rleg_joint_4)
            )

            ; install an effector to control the joint motors
            (node HingeEffector
                (setName rleg_eff_4)
            )
        )
    )

    ; left foot
    (node Transform
        (setName leftfoot)
        (setLocalPos $LeftShankPosX 
		     $LeftShankPosY
		     (eval $LeftShankPosZ - (eval $ShankHeight / 2.0) - (eval $FootHeight / 2.0) - 0.05)
	 )
        (importScene rsg/boxspheres/box.rsg $FootLength $FootWidth $FootHeight $FootMass matGrey)

        ; install hinge joint to connect to the shank
        (node UniversalJoint
            (attach ../boxBody ../../leftshank/boxBody)
            (setAnchor 0.0 0.0 (eval $FootHeight / 2.0))   
            (setAxis1 1.0 0.0 0.0) ; move around the x-axis
            (setAxis2 0.0 1.0 0.0) ; move around the y-axis

            ; enable the joint motors
           (setMaxMotorForce 0 100)
           (setMaxMotorForce 1 100)           

            ; install a perceptor
          (node UniversalJointPerceptor
              (setName lleg_joint_5_6)
         )

            ; install an effector to control the joint motors
            (node UniversalJointEffector
                (setName lleg_eff_5_6)
            )
        )

	; static box at the back of the foot
	(node Transform
	     (setLocalPos 0.0
			  (eval -1 * (eval (eval $FootWidth / 2.0) - (eval $AnkleBoxWidth / 2.0)))
			  (eval (eval $FootHeight / 2.0) + (eval $AnkleBoxHeight / 2.0))
	      )
	     (node Box
		   (setMaterial matGrey)
		   (setExtents $AnkleBoxLength $AnkleBoxWidth $AnkleBoxHeight)
	     )
	)
    )

    ; right foot
    (node Transform
        (setName rightfoot)
        (setLocalPos $RightShankPosX 
		     $RightShankPosY
		     (eval $RightShankPosZ - (eval $ShankHeight / 2.0) - (eval $FootHeight / 2.0) - 0.05)
	 )
        (importScene rsg/boxspheres/box.rsg $FootLength $FootWidth $FootHeight $FootMass matGrey)

        ; install hinge joint to connect to the shank
        (node UniversalJoint
            (attach ../boxBody ../../rightshank/boxBody)
            (setAnchor 0.0 0.0 (eval $FootHeight / 2.0))   
            (setAxis1 1.0 0.0 0.0) ; move around the x-axis
            (setAxis2 0.0 1.0 0.0) ; move around the y-axis

            ; enable the joint motors
            (setMaxMotorForce 0 100)
            (setMaxMotorForce 1 100)           

            ; install a perceptor
            (node UniversalJointPerceptor
                (setName rleg_joint_5_6)
            )

            ; install an effector to control the joint motors
            (node UniversalJointEffector
                (setName rleg_eff_5_6)
            )
        )

	; static box at the back of the foot
	(node Transform
	     (setLocalPos 0.0
			  (eval -1 * (eval (eval $FootWidth / 2.0) - (eval $AnkleBoxWidth / 2.0)))
			  (eval (eval $FootHeight / 2.0) + (eval $AnkleBoxHeight / 2.0))
	      )
	     (node Box
		   (setMaterial matGrey)
		   (setExtents $AnkleBoxLength $AnkleBoxWidth $AnkleBoxHeight)
	     )
	)
    )

) ; EOF

[simspark-cvs] simspark/contrib/plugin/soccer/soccernode .cvsignore, NONE, 1.1.2.1 soccernode.cpp, NONE, 1.1.2.1 soccernode.h, NONE, 1.1.2.1 soccernode_c.cpp, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/soccernode
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30785/soccernode

Added Files:
      Tag: WIN32
	.cvsignore soccernode.cpp soccernode.h soccernode_c.cpp 
Log Message:
- added minimal set off socces classes to support hoap2 bot. Rebased all nodes on 'SoccerNode' class

--- NEW FILE: .cvsignore ---
*.lo
.deps
.dirstamp
.libs
Makefile
Makefile.in
initeffector.la

--- NEW FILE: soccernode.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2004 RoboCup Soccer Server 3D Maintenance Group
   $Id: soccernode.cpp,v 1.1.2.1 2007/02/18 12:55:12 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "soccernode.h"
#include <oxygen/sceneserver/transform.h>
#include <zeitgeist/logserver/logserver.h>

using namespace oxygen;
using namespace boost;

SoccerNode::SoccerNode() : BaseNode()
{
}

SoccerNode::~SoccerNode()
{
}

boost::shared_ptr<oxygen::Transform>
SoccerNode::GetTransformParent() const
{
    return mTransformParent;
}

void
SoccerNode::UpdateCached()
{
    BaseNode::UpdateCached();

    mTransformParent = shared_dynamic_cast<Transform>
        (GetParentSupportingClass("Transform").lock());

    if (mTransformParent.get() == 0)
    {
        GetLog()->Error()
            << "Error: (SoccerNode: " << GetName()
            << ") parent node is not derived from TransformNode\n";
    }
}

void
SoccerNode::OnLink()
{
    BaseNode::OnLink();
    UpdateCached();
}

void
SoccerNode::OnUnlink()
{
    BaseNode::OnUnlink();
    mTransformParent.reset();
}

--- NEW FILE: soccernode_c.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: soccernode_c.cpp,v 1.1.2.1 2007/02/18 12:55:13 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#include "soccernode.h"

using namespace boost;
using namespace oxygen;
using namespace std;

void
CLASS(SoccerNode)::DefineClass()
{
    DEFINE_BASECLASS(oxygen/BaseNode);
}

--- NEW FILE: soccernode.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2004 RoboCup Soccer Server 3D Maintenance Group
   $Id: soccernode.h,v 1.1.2.1 2007/02/18 12:55:13 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef SOCCERNODE_H
#define SOCCERNODE_H

#include <oxygen/sceneserver/basenode.h>

namespace oxygen
{
    class Transform;
}

class SoccerNode : public oxygen::BaseNode
{
public:
    SoccerNode();
    virtual ~SoccerNode();

    boost::shared_ptr<oxygen::Transform> GetTransformParent() const;

    /** update variables from a script */
    virtual void UpdateCached();

protected:
    virtual void OnLink();
    virtual void OnUnlink();

    /** reference to the parent transform node*/
    boost::shared_ptr<oxygen::Transform> mTransformParent;
};

DECLARE_CLASS(SoccerNode);

#endif // SOCCERNODE_H

[simspark-cvs] simspark/contrib/plugin/soccer/soccerbase .cvsignore, NONE, 1.1.2.1 soccertypes.h, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/soccerbase
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30785/soccerbase

Added Files:
      Tag: WIN32
	.cvsignore soccertypes.h 
Log Message:
- added minimal set off socces classes to support hoap2 bot. Rebased all nodes on 'SoccerNode' class

--- NEW FILE: .cvsignore ---
*.lo
.deps
.dirstamp
.libs
Makefile
Makefile.in
initeffector.la

--- NEW FILE: soccertypes.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: soccertypes.h,v 1.1.2.1 2007/02/18 12:55:11 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef SOCCERTYPES_H
#define SOCCERTYPES_H

/** this file contains types common to all plugins in the soccer
    simulation
*/

#include <string>

enum TPlayMode
{
    // the order of the first 3 play modes should not be changed.
    PM_BeforeKickOff = 0,      /*!< before_kick_off:   before the match  */
    PM_KickOff_Left = 1,       /*!< kick_off_left:     kick off for the left team  */
    PM_KickOff_Right = 2,      /*!< kick_off_right:    kick off for the right team */
    PM_PlayOn,                 /*!< play_on:           regular game play */
    PM_KickIn_Left,
    PM_KickIn_Right,
    PM_CORNER_KICK_LEFT,       /*!< corner_kick_l:     corner kick left team   */
    PM_CORNER_KICK_RIGHT,      /*!< corner_kick_r:     corner kick right team  */
    PM_GOAL_KICK_LEFT,         /*!< goal_kick_l:       goal kick for left team */
    PM_GOAL_KICK_RIGHT,        /*!< goal_kick_r:       goal kick for right team*/
    PM_OFFSIDE_LEFT,           /*!< offside_l:         offside for left team   */
    PM_OFFSIDE_RIGHT,          /*!< offside_r:         offside for right team  */
    PM_GameOver,
    PM_Goal_Left,
    PM_Goal_Right,
    PM_FREE_KICK_LEFT,         /*!< free_kick_l:       free kick for left team */
    PM_FREE_KICK_RIGHT,        /*!< free_kick_r:       free kick for right team*/
    PM_NONE                    /*!< no play mode, this must be the last entry */
};

/** mapping from TPlayMode to string constants */
#define STR_PM_BeforeKickOff "BeforeKickOff"
#define STR_PM_KickOff_Left "KickOff_Left"
#define STR_PM_KickOff_Right "KickOff_Right"
#define STR_PM_PlayOn "PlayOn"
#define STR_PM_KickIn_Left "KickIn_Left"
#define STR_PM_KickIn_Right "KickIn_Right"
#define STR_PM_CORNER_KICK_LEFT "corner_kick_left"
#define STR_PM_CORNER_KICK_RIGHT "corner_kick_right"
#define STR_PM_GOAL_KICK_LEFT "goal_kick_left"
#define STR_PM_GOAL_KICK_RIGHT "goal_kick_right"
#define STR_PM_OFFSIDE_LEFT "offside_left"
#define STR_PM_OFFSIDE_RIGHT "offside_right"
#define STR_PM_GameOver "GameOver"
#define STR_PM_Goal_Left "Goal_Left"
#define STR_PM_Goal_Right "Goal_Right"
#define STR_PM_FREE_KICK_LEFT "free_kick_left"
#define STR_PM_FREE_KICK_RIGHT "free_kick_right"
#define STR_PM_Unknown "unknown"

enum TTeamIndex
{
    TI_NONE = 0,
    TI_LEFT = 1,
    TI_RIGHT = 2
};

typedef float TTime;

enum TGameHalf
{
    GH_NONE = 0,
    GH_FIRST = 1,
    GH_SECOND = 2
};

#endif // SOCCERTYPES_H

[simspark-cvs] simspark/contrib/plugin/soccer/objectstate objectstate.cpp, NONE, 1.1.2.1 objectstate.h, NONE, 1.1.2.1 objectstate_c.cpp, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/objectstate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30785/objectstate

Added Files:
      Tag: WIN32
	objectstate.cpp objectstate.h objectstate_c.cpp 
Log Message:
- added minimal set off socces classes to support hoap2 bot. Rebased all nodes on 'SoccerNode' class

--- NEW FILE: objectstate.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2004 RoboCup Soccer Server 3D Maintenance Group
   $Id: objectstate.cpp,v 1.1.2.1 2007/02/18 12:55:09 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "objectstate.h"

using namespace oxygen;

ObjectState::ObjectState() : SoccerNode()
{
}

ObjectState::~ObjectState()
{
}

void
ObjectState::SetPerceptName(const std::string& name, TPerceptType pt)
{
    mPerceptNames[pt] = name;
}

void
ObjectState::SetPerceptName(const std::string& name, TPerceptType pt1, TPerceptType pt2)
{
    mPerceptNames[pt1] = "Player";
    mPerceptNames[pt2] = name;
 
}

std::string
ObjectState::GetPerceptName(TPerceptType pt) const
{
    TPerceptStringMap::const_iterator i = mPerceptNames.find(pt);
    if (i == mPerceptNames.end())
        return std::string();

    return i->second;
}

void
ObjectState::SetID(const std::string& id, TPerceptType pt)
{
    mIDs[pt] = id;
}

std::string
ObjectState::GetID(TPerceptType pt) const
{
    TPerceptStringMap::const_iterator i = mIDs.find(pt);
    if (i == mIDs.end())
        return std::string();

    return i->second;
}

--- NEW FILE: objectstate_c.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: objectstate_c.cpp,v 1.1.2.1 2007/02/18 12:55:11 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#include "objectstate.h"

using namespace boost;
using namespace oxygen;
using namespace std;

FUNCTION(ObjectState,setPerceptName)
{
    string inName;

    if (
        (in.GetSize() != 1) ||
        (! in.GetValue(in.begin(),inName))
        )
        {
            return false;
        }

    obj->SetPerceptName(inName);
    return true;
}

FUNCTION(ObjectState,setID)
{
    string inId;

    if (
        (in.GetSize() != 1) ||
        (! in.GetValue(in.begin(), inId))
        )
        {
            return false;
        }

    obj->SetID(inId);
    return true;
}

void
CLASS(ObjectState)::DefineClass()
{
    DEFINE_BASECLASS(SoccerNode);
    DEFINE_FUNCTION(setPerceptName);
    DEFINE_FUNCTION(setID);
}

--- NEW FILE: objectstate.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2004 RoboCup Soccer Server 3D Maintenance Group
   $Id: objectstate.h,v 1.1.2.1 2007/02/18 12:55:10 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef OBJECTSTATE_H
#define OBJECTSTATE_H

#include <soccer/soccernode/soccernode.h>

class ObjectState : public SoccerNode
{
public:
    typedef enum TPerceptType
    {
        PT_Default,
        PT_TooFar,
        PT_Player
    };

public:
    ObjectState();
    virtual ~ObjectState();

    /** set the object name for perceptors */
    virtual void SetPerceptName(const std::string& name,
                                TPerceptType pt = PT_Default);
				
     /** set the object name for perceptors */
    virtual void SetPerceptName(const std::string& name,
                                TPerceptType pt1 ,
                                TPerceptType pt2 );

    /** returns the object name for perceptors */
    virtual std::string GetPerceptName(TPerceptType pt = PT_Default) const;

    /** set the object id for perceptors */
    virtual void SetID(const std::string& id, TPerceptType pt = PT_Default);

    /** returns the object id */
    virtual std::string GetID(TPerceptType pt = PT_Default) const;

protected:
    typedef std::map<TPerceptType, std::string> TPerceptStringMap;

    /** object names */
    TPerceptStringMap mPerceptNames;

    /** object ids */
    TPerceptStringMap mIDs;
};

DECLARE_CLASS(ObjectState);

#endif // OBJECTSTATE_H

[simspark-cvs] simspark/contrib/plugin/soccer .cvsignore, NONE, 1.1.2.1 export.cpp, NONE, 1.1.2.1 soccer.vcproj, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30785

Added Files:
      Tag: WIN32
	.cvsignore export.cpp soccer.vcproj 
Log Message:
- added minimal set off socces classes to support hoap2 bot. Rebased all nodes on 'SoccerNode' class

--- NEW FILE: soccer.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="soccer"
	ProjectGUID="{D6BD532A-E11A-4391-A37C-2D55027EE219}"
	RootNamespace="soccer"
	Keyword="Win32Proj"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="2"
			CharacterSet="0"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility;..\"
				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				MinimalRebuild="true"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="msvcrt-ruby18.lib ode.lib"
				LinkIncremental="2"
				GenerateDebugInformation="true"
				SubSystem="2"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="VCRelease|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="2"
			CharacterSet="0"
			WholeProgramOptimization="1"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories="..\..\..\spark\win32;..\..\..\spark;..\..\..\spark\utility"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				RuntimeLibrary="2"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="3"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="msvcrt-ruby18.lib"
				LinkIncremental="1"
				GenerateDebugInformation="true"
				SubSystem="2"
				OptimizeReferences="2"
				EnableCOMDATFolding="2"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="objectstate"
			>
			<File
				RelativePath=".\objectstate\objectstate.cpp"
				>
			</File>
			<File
				RelativePath=".\objectstate\objectstate.h"
				>
			</File>
			<File
				RelativePath=".\objectstate\objectstate_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="soccernode"
			>
			<File
				RelativePath=".\soccernode\soccernode.cpp"
				>
			</File>
			<File
				RelativePath=".\soccernode\soccernode.h"
				>
			</File>
			<File
				RelativePath=".\soccernode\soccernode_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="agentstate"
			>
			<File
				RelativePath=".\agentstate\agentstate.cpp"
				>
			</File>
			<File
				RelativePath=".\agentstate\agentstate.h"
				>
			</File>
			<File
				RelativePath=".\agentstate\agentstate_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="soccerbase"
			>
			<File
				RelativePath=".\soccerbase\soccertypes.h"
				>
			</File>
		</Filter>
		<File
			RelativePath=".\export.cpp"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: export.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: export.cpp,v 1.1.2.1 2007/02/18 12:54:55 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#include <zeitgeist/zeitgeist.h>
#include <soccer/soccernode/soccernode.h>
#include <soccer/objectstate/objectstate.h>
#include <soccer/agentstate/agentstate.h>

ZEITGEIST_EXPORT_BEGIN()
        ZEITGEIST_EXPORT(SoccerNode);
        ZEITGEIST_EXPORT(ObjectState);
        ZEITGEIST_EXPORT(AgentState);
ZEITGEIST_EXPORT_END()


--- NEW FILE: .cvsignore ---
*.lo
.deps
.dirstamp
.libs

[simspark-cvs] simspark/contrib/plugin/soccer/agentstate .cvsignore, NONE, 1.1.2.1 agentstate.cpp, NONE, 1.1.2.1 agentstate.h, NONE, 1.1.2.1 agentstate_c.cpp, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/agentstate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30785/agentstate

Added Files:
      Tag: WIN32
	.cvsignore agentstate.cpp agentstate.h agentstate_c.cpp 
Log Message:
- added minimal set off socces classes to support hoap2 bot. Rebased all nodes on 'SoccerNode' class

--- NEW FILE: agentstate.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: agentstate.h,v 1.1.2.1 2007/02/18 12:55:00 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef AGENTSTATE_H
#define AGENTSTATE_H

#include <soccer/soccerbase/soccertypes.h>
#include <soccer/objectstate/objectstate.h>

namespace oxygen
{
    class Body;
}

class AgentState : public ObjectState
{
    //
    // functions
    //
public:
    AgentState();
    virtual ~AgentState();

    /** set the team index */
    void SetTeamIndex(TTeamIndex idx);

    /** returns the team index */
    TTeamIndex GetTeamIndex() const;

    /** Set the uniform number.
     *
     * This sets both the uniform number as well as the object id
     * (only the representation is different).
     */
    void SetUniformNumber(int number);

    /** returns the uniform number as integer */
    int GetUniformNumber() const;

    /** Set the object id for perceptors.
     *
     * This method is the same as SetUniformNumber for AgentState.
     * If id is not an integer, the object ID will not be changed.
     *
     * \param id a new ID, an integer represented as std::string.
     * \param pt the percept type for which the ID is set
     */
    virtual void SetID(const std::string& id, TPerceptType pt = PT_Default);

    /** Get the battery state */
    float GetBattery() const;

    /** Set the battery state */
    void SetBattery(float battery);

    /** Get the motor temperature */
    float GetTemperature() const;

    /** Set the temperature */
    void SetTemperature(float temperature);

    /** reduce battery by the given amout.
     *  \param consumption the amount by which the battery is reduced if possible
     *  \return true if the battery if good enough for the given consumption
     */
    bool ReduceBattery(float consumption);

    /** Add a new message to the list */
    void AddMessage(const std::string& msg, float direction, bool teamMate);
    void AddSelfMessage(const std::string& msg);

    /** Get the first message from the list */
    bool GetMessage(std::string& msg, float& direction, bool teamMate);
    bool GetSelfMessage(std::string& msg);

protected:
    /** team index */
    TTeamIndex mTeamIndex;

    /** uniform number */
    int mUniformNumber;

    /** motor temperature */
    float mTemperature;

    /** battery state */
    float mBattery;

    /** self message */
    std::string mSelfMsg;

    /** team-mate's message */
    std::string mMateMsg;
    float mMateMsgDir;

    /** opponent's message */
    std::string mOppMsg;
    float mOppMsgDir;

    /** max hear capacity units */
    int mHearMax;
    /** hear capacity increase units when it's silent */
    int mHearInc;
    /** hear capacity decrease units when player hears a message */
    int mHearDecay;

    /** hear capacity for his team */
    int mHearMateCap;
    /** hear capacity for opponent team */
    int mHearOppCap;

    /** is there any message from myself */
    bool mIfSelfMsg;
    /** is there any message from teammate */
    bool mIfMateMsg;
    /** is there any message from oponnent */
    bool mIfOppMsg;
};

DECLARE_CLASS(AgentState);

#endif // AGENTSTATE_H

--- NEW FILE: agentstate.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: agentstate.cpp,v 1.1.2.1 2007/02/18 12:55:00 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "agentstate.h"
#include <soccer/soccerbase/soccertypes.h>
#include <sstream>

using namespace oxygen;
using namespace std;

AgentState::AgentState() : ObjectState(), mTeamIndex(TI_NONE),
                           mTemperature(20.0), mBattery(100.0),
                           mHearMax(2), mHearInc(1),
                           mHearDecay(2), mHearMateCap(2),
                           mHearOppCap(2), mIfSelfMsg(false),
                           mIfMateMsg(false), mIfOppMsg(false)
{
    // set mID and mUniformNumber into a joint state
    SetUniformNumber(0);
}

AgentState::~AgentState()
{
}

void
AgentState::SetTeamIndex(TTeamIndex idx)
{
    mTeamIndex = idx;
}

TTeamIndex
AgentState::GetTeamIndex() const
{
    return mTeamIndex;
}


void
AgentState::SetUniformNumber(int number)
{
    mUniformNumber = number;
    std::ostringstream ss;
    ss << number;
    ObjectState::SetID(ss.str());
}

int
AgentState::GetUniformNumber() const
{
    return mUniformNumber;
}

void
AgentState::SetID(const std::string& id, TPerceptType pt)
{
    std::istringstream iss(id);
    iss >> mUniformNumber;
    if (!iss)
    {
        // conversion failed. mUniformNumber is not changed.
        return;
    }
    ObjectState::SetID(id,pt);
}

float
AgentState::GetBattery() const
{
    return mBattery;
}

void
AgentState::SetBattery(float battery)
{
    mBattery = battery;
}

float
AgentState::GetTemperature() const
{
    return 23.0;
}

void
AgentState::SetTemperature(float temperature)
{
    mTemperature = temperature;
}

bool
AgentState::ReduceBattery(float consumption)
{
    if (mBattery - consumption >= 0.0)
    {
        mBattery -= consumption;
        return true;
    }
    return false;
}

void
AgentState::AddMessage(const string& msg, float direction, bool teamMate)
{
    if (teamMate)
    {
        if (mHearMateCap < mHearDecay)
        {
            return;
        }

        mHearMateCap -= mHearDecay;

        mMateMsg = msg;
        mMateMsgDir = direction;
        mIfMateMsg = true;
    }
    else
    {
        if (mHearOppCap < mHearDecay)
        {
            return;
        }

        mHearOppCap -= mHearDecay;

        mOppMsg = msg;
        mOppMsgDir = direction;
        mIfOppMsg = true;
    }
}

void
AgentState::AddSelfMessage(const string& msg)
{
    mSelfMsg = msg;
    mIfSelfMsg = true;
}

bool
AgentState::GetMessage(string& msg, float& direction, bool teamMate)
{
    if (teamMate)
    {
        if (mHearMateCap < mHearMax)
        {
            mHearMateCap += mHearInc;
        }

        if (! mIfMateMsg)
        {
            return false;
        }

        msg = mMateMsg;
        direction = mMateMsgDir;
        mIfMateMsg = false;
        return true;
    }
    else
    {
        if (mHearOppCap < mHearMax)
        {
            mHearOppCap += mHearInc;
        }

        if (! mIfOppMsg)
        {
            return false;
        }

        msg = mOppMsg;
        direction = mOppMsgDir;
        mIfOppMsg = false;
        return true;
    }
}

bool
AgentState::GetSelfMessage(string& msg)
{
    if (! mIfSelfMsg)
    {
        return false;
    }

    msg = mSelfMsg;
    mIfSelfMsg = false;

    return true;
}

--- NEW FILE: agentstate_c.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: agentstate_c.cpp,v 1.1.2.1 2007/02/18 12:55:00 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#include "agentstate.h"

using namespace boost;
using namespace oxygen;

void
CLASS(AgentState)::DefineClass()
{
    DEFINE_BASECLASS(ObjectState);
}

--- NEW FILE: .cvsignore ---
*.lo
.deps
.dirstamp
.libs
Makefile
Makefile.in
initeffector.la

[simspark-cvs] simspark/contrib/plugin/soccer/soccerbase - New directory

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/soccerbase
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29945/soccerbase

Log Message:
Directory /cvsroot/simspark/simspark/contrib/plugin/soccer/soccerbase added to the repository
--> Using per-directory sticky tag `WIN32'

[simspark-cvs] simspark/contrib/plugin/soccer/agentstate - New directory

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/agentstate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29945/agentstate

Log Message:
Directory /cvsroot/simspark/simspark/contrib/plugin/soccer/agentstate added to the repository
--> Using per-directory sticky tag `WIN32'

[simspark-cvs] simspark/contrib/plugin/soccer/soccernode - New directory

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/soccernode
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29945/soccernode

Log Message:
Directory /cvsroot/simspark/simspark/contrib/plugin/soccer/soccernode added to the repository
--> Using per-directory sticky tag `WIN32'

[simspark-cvs] simspark/contrib/plugin/soccer/objectstate - New directory

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/objectstate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29945/objectstate

Log Message:
Directory /cvsroot/simspark/simspark/contrib/plugin/soccer/objectstate added to the repository
--> Using per-directory sticky tag `WIN32'

[simspark-cvs] simspark/contrib/plugin/soccer - New directory

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/plugin/soccer
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29532/soccer

Log Message:
Directory /cvsroot/simspark/simspark/contrib/plugin/soccer added to the repository
--> Using per-directory sticky tag `WIN32'

[simspark-cvs] simspark/spark/plugin/sparkagent hinge2perceptor.cpp, 1.2, 1.2.2.1 hinge2perceptor.h, 1.2, 1.2.2.1 hingeperceptor.cpp, 1.1, 1.1.2.1 hingeperceptor.h, 1.1, 1.1.2.1 universaljointperceptor.cpp, 1.2, 1.2.2.1 universaljointperceptor.h, 1.1, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/sparkagent
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29117

Modified Files:
      Tag: WIN32
	hinge2perceptor.cpp hinge2perceptor.h hingeperceptor.cpp 
	hingeperceptor.h universaljointperceptor.cpp 
	universaljointperceptor.h 
Log Message:
- use JointPerceptor template

Index: hingeperceptor.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hingeperceptor.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** hingeperceptor.h	2 Jan 2006 18:11:33 -0000	1.1
--- hingeperceptor.h	18 Feb 2007 12:50:58 -0000	1.1.2.1
***************
*** 21,28 ****
  #define HINGEPERCEPTOR_H
  
! #include <oxygen/agentaspect/perceptor.h>
  #include <oxygen/physicsserver/hingejoint.h>
  
! class HingePerceptor : public oxygen::Perceptor
  {
  public:
--- 21,28 ----
  #define HINGEPERCEPTOR_H
  
! #include <oxygen/agentaspect/jointperceptor.h>
  #include <oxygen/physicsserver/hingejoint.h>
  
! class HingePerceptor : public oxygen::JointPerceptor<oxygen::HingeJoint>
  {
  public:
***************
*** 34,46 ****
  
  protected:
-     virtual void OnLink();
-     virtual void OnUnlink();
- 
      void InsertAxisAngle(oxygen::Predicate& predicate);
      void InsertAxisRate(oxygen::Predicate& predicate);
- 
- protected:
-     /** cached reference to the monitor joint */
-     boost::shared_ptr<oxygen::HingeJoint> mJoint;
  };
  
--- 34,39 ----

Index: universaljointperceptor.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/universaljointperceptor.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** universaljointperceptor.h	6 Jan 2006 13:57:36 -0000	1.1
--- universaljointperceptor.h	18 Feb 2007 12:50:58 -0000	1.1.2.1
***************
*** 21,28 ****
  #define UNIVERSALJOINTPERCEPTOR_H
  
! #include <oxygen/agentaspect/perceptor.h>
  #include <oxygen/physicsserver/universaljoint.h>
  
! class UniversalJointPerceptor : public oxygen::Perceptor
  {
  public:
--- 21,28 ----
  #define UNIVERSALJOINTPERCEPTOR_H
  
! #include <oxygen/agentaspect/jointperceptor.h>
  #include <oxygen/physicsserver/universaljoint.h>
  
! class UniversalJointPerceptor : public oxygen::JointPerceptor<oxygen::UniversalJoint>
  {
  public:
***************
*** 34,46 ****
  
  protected:
-     virtual void OnLink();
-     virtual void OnUnlink();
- 
      void InsertAxisAngle(oxygen::Predicate& predicate, oxygen::Joint::EAxisIndex idx);
      void InsertAxisRate(oxygen::Predicate& predicate, oxygen::Joint::EAxisIndex idx);
- 
- protected:
-     /** cached reference to the monitor joint */
-     boost::shared_ptr<oxygen::UniversalJoint> mJoint;
  };
  
--- 34,39 ----

Index: hinge2perceptor.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hinge2perceptor.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** hinge2perceptor.h	2 Jan 2006 18:11:33 -0000	1.2
--- hinge2perceptor.h	18 Feb 2007 12:50:58 -0000	1.2.2.1
***************
*** 23,30 ****
  #define HINGE2PERCEPTOR_H
  
! #include <oxygen/agentaspect/perceptor.h>
  #include <oxygen/physicsserver/hinge2joint.h>
  
! class Hinge2Perceptor : public oxygen::Perceptor
  {
  public:
--- 23,30 ----
  #define HINGE2PERCEPTOR_H
  
! #include <oxygen/agentaspect/jointperceptor.h>
  #include <oxygen/physicsserver/hinge2joint.h>
  
! class Hinge2Perceptor : public oxygen::JointPerceptor<oxygen::Hinge2Joint>
  {
  public:
***************
*** 36,49 ****
  
  protected:
-     virtual void OnLink();
-     virtual void OnUnlink();
- 
      void InsertAxisAngle(oxygen::Predicate& predicate, oxygen::Joint::EAxisIndex idx);
      void InsertAxisRate(oxygen::Predicate& predicate, oxygen::Joint::EAxisIndex idx);
- 
- 
- protected:
-     /** cached reference to the monitor joint */
-     boost::shared_ptr<oxygen::Hinge2Joint> mJoint;
  };
  
--- 36,41 ----

Index: universaljointperceptor.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/universaljointperceptor.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** universaljointperceptor.cpp	22 Jan 2006 11:57:40 -0000	1.2
--- universaljointperceptor.cpp	18 Feb 2007 12:50:58 -0000	1.2.2.1
***************
*** 26,30 ****
  using namespace std;
  
! UniversalJointPerceptor::UniversalJointPerceptor() : Perceptor()
  {
  }
--- 26,31 ----
  using namespace std;
  
! UniversalJointPerceptor::UniversalJointPerceptor()
!     : JointPerceptor<UniversalJoint>::JointPerceptor()
  {
  }
***************
*** 34,54 ****
  }
  
- void UniversalJointPerceptor::OnLink()
- {
-     mJoint = make_shared(FindParentSupportingClass<UniversalJoint>());
- 
-     if (mJoint.get() == 0)
-         {
-             GetLog()->Error()
-                 << "(UniversalJointPerceptor) ERROR: found no UniversalJoint parent\n";
-         }
- 
- }
- 
- void UniversalJointPerceptor::OnUnlink()
- {
-     mJoint.reset();
- }
- 
  void UniversalJointPerceptor::InsertAxisAngle(Predicate& predicate, Joint::EAxisIndex idx)
  {
--- 35,38 ----
***************
*** 103,106 ****
      return true;
  }
- 
- 
--- 87,88 ----

Index: hingeperceptor.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hingeperceptor.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** hingeperceptor.cpp	2 Jan 2006 18:11:33 -0000	1.1
--- hingeperceptor.cpp	18 Feb 2007 12:50:58 -0000	1.1.2.1
***************
*** 26,30 ****
  using namespace std;
  
! HingePerceptor::HingePerceptor() : Perceptor()
  {
  }
--- 26,31 ----
  using namespace std;
  
! HingePerceptor::HingePerceptor()
!     : JointPerceptor<HingeJoint>::JointPerceptor()
  {
  }
***************
*** 34,54 ****
  }
  
- void HingePerceptor::OnLink()
- {
-     mJoint = make_shared(FindParentSupportingClass<HingeJoint>());
- 
-     if (mJoint.get() == 0)
-         {
-             GetLog()->Error()
-                 << "(HingePerceptor) ERROR: found no HingeJoint parent\n";
-         }
- 
- }
- 
- void HingePerceptor::OnUnlink()
- {
-     mJoint.reset();
- }
- 
  void HingePerceptor::InsertAxisAngle(Predicate& predicate)
  {
--- 35,38 ----

Index: hinge2perceptor.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hinge2perceptor.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** hinge2perceptor.cpp	2 Jan 2006 18:11:33 -0000	1.2
--- hinge2perceptor.cpp	18 Feb 2007 12:50:58 -0000	1.2.2.1
***************
*** 28,32 ****
  using namespace std;
  
! Hinge2Perceptor::Hinge2Perceptor() : Perceptor()
  {
  }
--- 28,33 ----
  using namespace std;
  
! Hinge2Perceptor::Hinge2Perceptor()
!     : JointPerceptor<Hinge2Joint>::JointPerceptor()
  {
  }
***************
*** 36,56 ****
  }
  
- void Hinge2Perceptor::OnLink()
- {
-     mJoint = make_shared(FindParentSupportingClass<Hinge2Joint>());
- 
-     if (mJoint.get() == 0)
-         {
-             GetLog()->Error()
-                 << "(Hinge2Perceptor) ERROR: found no Hinge2Joint parent\n";
-         }
- 
- }
- 
- void Hinge2Perceptor::OnUnlink()
- {
-     mJoint.reset();
- }
- 
  void Hinge2Perceptor::InsertAxisAngle(Predicate& predicate, Joint::EAxisIndex idx)
  {
--- 37,40 ----

[simspark-cvs] simspark/spark/oxygen/agentaspect jointperceptor.h, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/agentaspect
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29082

Added Files:
      Tag: WIN32
	jointperceptor.h 
Log Message:
- added JointPerceptor template class that encapsulates common effector
code (OnLink, OnUnlink and UpdateCachedData)

--- NEW FILE: jointperceptor.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Thu Nov 8 2005
   Copyright (C) 2005 RoboCup Soccer Server 3D Maintenance Group

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef JOINTPERCEPTOR_H
#define JOINTPERCEPTOR_H

#include <oxygen/agentaspect/perceptor.h>

namespace oxygen
{

template<typename _JOINT>
class JointPerceptor : public oxygen::Perceptor
{
public:
    JointPerceptor()
    {
    }

    virtual ~JointPerceptor()
    {
    }

    virtual void UpdateCached()
    {
        Perceptor::UpdateCached();
        mJoint = make_shared(FindParentSupportingClass<_JOINT>());

        if (mJoint.get() == 0)
            {
                GetLog()->Error()
                    << "(" << GetClass()->GetName()
                    << ") ERROR: found no Joint parent\n";
            }
    }

protected:
    virtual void OnLink()
    {
        Perceptor::OnLink();
        UpdateCached();
    }

    virtual void OnUnlink()
    {
        Perceptor::OnUnlink();
        mJoint.reset();
    }

protected:
    /** cached reference to the joint */
    boost::shared_ptr<_JOINT> mJoint;
};

} // namespace oxygen

#endif //JOINTPERCEPTOR_H

[simspark-cvs] simspark/spark/oxygen/agentaspect jointeffector.h, 1.1.2.1, 1.1.2.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/agentaspect
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28678

Modified Files:
      Tag: WIN32
	jointeffector.h 
Log Message:
- fix: use UpdateCached instead of ClearCachedData

Index: jointeffector.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/agentaspect/Attic/jointeffector.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** jointeffector.h	18 Feb 2007 12:32:05 -0000	1.1.2.1
--- jointeffector.h	18 Feb 2007 12:49:53 -0000	1.1.2.2
***************
*** 40,56 ****
      }
  
!     /** clears any cached data (e.g. the cached full path and
!         forces the node to recalculate all values */
!     void ClearCachedData()
!     {
!         Effector::ClearCachedData();
!         mJoint.reset();
!     }
! 
! protected:
!     /** setup the reference to the HingeJoint parent node */
!     virtual void OnLink()
      {
!         Effector::OnLink();
          mJoint = make_shared(FindParentSupportingClass<_JOINT>());
  
--- 40,46 ----
      }
  
!     virtual void UpdateCached()
      {
!         Effector::UpdateCached();
          mJoint = make_shared(FindParentSupportingClass<_JOINT>());
  
***************
*** 63,66 ****
--- 53,64 ----
      }
  
+ protected:
+     /** setup the reference to the HingeJoint parent node */
+     virtual void OnLink()
+     {
+         Effector::OnLink();
+         UpdateCached();
+     }
+ 
      /** remove the reference to the HingeJoint parent node */
      virtual void OnUnlink()

[simspark-cvs] simspark/spark/plugin/sparkagent hinge2effector.cpp, 1.2, 1.2.2.1 hinge2effector.h, 1.2, 1.2.2.1 hingeeffector.cpp, 1.2, 1.2.2.1 hingeeffector.h, 1.1, 1.1.2.1 universaljointeffector.cpp, 1.2, 1.2.2.1 universaljointeffector.h, 1.1, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/sparkagent
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22134

Modified Files:
      Tag: WIN32
	hinge2effector.cpp hinge2effector.h hingeeffector.cpp 
	hingeeffector.h universaljointeffector.cpp 
	universaljointeffector.h 
Log Message:
- converted to use JointEffector base class

Index: universaljointeffector.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/universaljointeffector.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** universaljointeffector.h	6 Jan 2006 13:57:36 -0000	1.1
--- universaljointeffector.h	18 Feb 2007 12:32:25 -0000	1.1.2.1
***************
*** 21,28 ****
  #define UNIVERSALJOINTEFFECTOR_H
  
! #include <oxygen/agentaspect/effector.h>
  #include <oxygen/physicsserver/universaljoint.h>
  
! class UniversalJointEffector : public oxygen::Effector
  {
  public:
--- 21,28 ----
  #define UNIVERSALJOINTEFFECTOR_H
  
! #include <oxygen/agentaspect/jointeffector.h>
  #include <oxygen/physicsserver/universaljoint.h>
  
! class UniversalJointEffector : public oxygen::JointEffector<oxygen::UniversalJoint>
  {
  public:
***************
*** 39,54 ****
      virtual boost::shared_ptr<oxygen::ActionObject>
      GetActionObject(const oxygen::Predicate& predicate);
- 
- protected:
-     /** setup the reference to the HingeJoint parent node */
-     virtual void OnLink();
- 
-     /** remove the reference to the HingeJoint parent node */
-     virtual void OnUnlink();
- 
- protected:
-     /** cached reference to the monitor joint */
-     boost::shared_ptr<oxygen::UniversalJoint> mJoint;
- 
  };
  
--- 39,42 ----

Index: hingeeffector.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hingeeffector.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** hingeeffector.h	2 Jan 2006 18:11:33 -0000	1.1
--- hingeeffector.h	18 Feb 2007 12:32:25 -0000	1.1.2.1
***************
*** 21,28 ****
  #define HINGEEFFECTOR_H
  
! #include <oxygen/agentaspect/effector.h>
  #include <oxygen/physicsserver/hingejoint.h>
  
! class HingeEffector : public oxygen::Effector
  {
  public:
--- 21,28 ----
  #define HINGEEFFECTOR_H
  
! #include <oxygen/agentaspect/jointeffector.h>
  #include <oxygen/physicsserver/hingejoint.h>
  
! class HingeEffector : public oxygen::JointEffector<oxygen::HingeJoint>
  {
  public:
***************
*** 39,54 ****
      virtual boost::shared_ptr<oxygen::ActionObject>
      GetActionObject(const oxygen::Predicate& predicate);
- 
- protected:
-     /** setup the reference to the HingeJoint parent node */
-     virtual void OnLink();
- 
-     /** remove the reference to the HingeJoint parent node */
-     virtual void OnUnlink();
- 
- protected:
-     /** cached reference to the monitor joint */
-     boost::shared_ptr<oxygen::HingeJoint> mJoint;
- 
  };
  
--- 39,42 ----

Index: universaljointeffector.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/universaljointeffector.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** universaljointeffector.cpp	24 Jan 2006 19:16:32 -0000	1.2
--- universaljointeffector.cpp	18 Feb 2007 12:32:25 -0000	1.2.2.1
***************
*** 27,33 ****
  using namespace std;
  
! UniversalJointEffector::UniversalJointEffector() : Effector()
  {
-     SetName("universaljoint");
  }
  
--- 27,33 ----
  using namespace std;
  
! UniversalJointEffector::UniversalJointEffector()
!     : JointEffector<UniversalJoint>::JointEffector("universaljoint")
  {
  }
  
***************
*** 100,117 ****
      return shared_ptr<ActionObject>();
  }
- 
- void UniversalJointEffector::OnLink()
- {
-     mJoint = make_shared(FindParentSupportingClass<UniversalJoint>());
- 
-     if (mJoint.get() == 0)
-         {
-             GetLog()->Error()
-                 << "(UniversalJointEffector) ERROR: found no UniversalJoint parent\n";
-         }
- }
- 
- void UniversalJointEffector::OnUnlink()
- {
-     mJoint.reset();
- }
--- 100,101 ----

Index: hinge2effector.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hinge2effector.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** hinge2effector.cpp	2 Jan 2006 18:11:33 -0000	1.2
--- hinge2effector.cpp	18 Feb 2007 12:32:24 -0000	1.2.2.1
***************
*** 28,34 ****
  using namespace std;
  
! Hinge2Effector::Hinge2Effector() : Effector()
  {
-     SetName("hinge2");
  }
  
--- 28,34 ----
  using namespace std;
  
! Hinge2Effector::Hinge2Effector()
!     : JointEffector<Hinge2Joint>::JointEffector("hinge2")
  {
  }
  
***************
*** 93,111 ****
      return shared_ptr<ActionObject>();
  }
- 
- void Hinge2Effector::OnLink()
- {
-     mJoint = make_shared(FindParentSupportingClass<Hinge2Joint>());
- 
-     if (mJoint.get() == 0)
-         {
-             GetLog()->Error()
-                 << "(Hinge2Effector) ERROR: found no Hinge2Joint parent\n";
-         }
- 
- }
- 
- void Hinge2Effector::OnUnlink()
- {
-     mJoint.reset();
- }
--- 93,94 ----

Index: hingeeffector.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hingeeffector.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** hingeeffector.cpp	6 Jan 2006 13:57:36 -0000	1.2
--- hingeeffector.cpp	18 Feb 2007 12:32:24 -0000	1.2.2.1
***************
*** 27,33 ****
  using namespace std;
  
! HingeEffector::HingeEffector() : Effector()
  {
-     SetName("hinge");
  }
  
--- 27,33 ----
  using namespace std;
  
! HingeEffector::HingeEffector()
!     : JointEffector<HingeJoint>::JointEffector("hinge")
  {
  }
  
***************
*** 91,109 ****
      return shared_ptr<ActionObject>();
  }
- 
- void HingeEffector::OnLink()
- {
-     mJoint = make_shared(FindParentSupportingClass<HingeJoint>());
- 
-     if (mJoint.get() == 0)
-         {
-             GetLog()->Error()
-                 << "(HingeEffector) ERROR: found no HingeJoint parent\n";
-         }
- 
- }
- 
- void HingeEffector::OnUnlink()
- {
-     mJoint.reset();
- }
--- 91,92 ----

Index: hinge2effector.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hinge2effector.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** hinge2effector.h	2 Jan 2006 18:11:33 -0000	1.2
--- hinge2effector.h	18 Feb 2007 12:32:24 -0000	1.2.2.1
***************
*** 23,30 ****
  #define HINGE2EFFECTOR_H
  
! #include <oxygen/agentaspect/effector.h>
  #include <oxygen/physicsserver/hinge2joint.h>
  
! class Hinge2Effector : public oxygen::Effector
  {
  public:
--- 23,30 ----
  #define HINGE2EFFECTOR_H
  
! #include <oxygen/agentaspect/jointeffector.h>
  #include <oxygen/physicsserver/hinge2joint.h>
  
! class Hinge2Effector : public oxygen::JointEffector<oxygen::Hinge2Joint>
  {
  public:
***************
*** 41,56 ****
      virtual boost::shared_ptr<oxygen::ActionObject>
      GetActionObject(const oxygen::Predicate& predicate);
- 
- protected:
-     /** setup the reference to the Hinge2Joint parent node */
-     virtual void OnLink();
- 
-     /** remove the reference to the Hinge2Joint parent node */
-     virtual void OnUnlink();
- 
- protected:
-     /** cached reference to the monitor joint */
-     boost::shared_ptr<oxygen::Hinge2Joint> mJoint;
- 
  };
  
--- 41,44 ----

[simspark-cvs] simspark/spark/oxygen/agentaspect jointeffector.h, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/agentaspect
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21849

Added Files:
      Tag: WIN32
	jointeffector.h 
Log Message:
- added JointEffector template class that encapsulates common effector
code (OnLink, OnUnlink and ClearCachedData)

--- NEW FILE: jointeffector.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Wed Nov 9 2005
   Copyright (C) 2005 RoboCup Soccer Server 3D Maintenance Group

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef JOINTEFFECTOR_H
#define JOINTEFFECTOR_H

#include <oxygen/agentaspect/effector.h>

namespace oxygen
{

template<typename _JOINT>
class JointEffector : public oxygen::Effector
{
public:
    JointEffector(const std::string& name)
        : Effector()
    {
        SetName(name);
    }

    virtual ~JointEffector()
    {
    }

    /** clears any cached data (e.g. the cached full path and
        forces the node to recalculate all values */
    void ClearCachedData()
    {
        Effector::ClearCachedData();
        mJoint.reset();
    }

protected:
    /** setup the reference to the HingeJoint parent node */
    virtual void OnLink()
    {
        Effector::OnLink();
        mJoint = make_shared(FindParentSupportingClass<_JOINT>());

        if (mJoint.get() == 0)
        {
            GetLog()->Error()
                << "(" << GetClass()->GetName()
                << ") ERROR: found no Joint parent\n";
        }
    }

    /** remove the reference to the HingeJoint parent node */
    virtual void OnUnlink()
    {
        Effector::OnUnlink();
        mJoint.reset();
    }

protected:
    /** cached reference to the joint */
    boost::shared_ptr<_JOINT> mJoint;
};

} // namespace oxygen

#endif // JOINTEFFECTOR_H

[simspark-cvs] simspark/spark simspark.sln,1.1.2.5,1.1.2.6

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23566

Modified Files:
      Tag: WIN32
	simspark.sln 
Log Message:
- add spark agent plugins to win32 build

Index: simspark.sln
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/Attic/simspark.sln,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** simspark.sln	11 Feb 2007 10:40:55 -0000	1.1.2.5
--- simspark.sln	18 Feb 2007 12:06:36 -0000	1.1.2.6
***************
*** 10,22 ****
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coretest", "test\coretest\coretest.vcproj", "{FC4C3571-034B-4CB5-9CF3-3411205C9433}"
  	ProjectSection(ProjectDependencies) = postProject
- 		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
- 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9}
- 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
- 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
- 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9}
  	EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygen", "oxygen\oxygen.vcproj", "{DAB59CC4-E184-40CC-A858-27C432A53AAB}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcssnet", "utility\rcssnet\rcssnet.vcproj", "{ABCC65CE-0762-42F2-8459-41722DCF02D9}"
--- 10,25 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coretest", "test\coretest\coretest.vcproj", "{FC4C3571-034B-4CB5-9CF3-3411205C9433}"
  	ProjectSection(ProjectDependencies) = postProject
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9}
+ 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
+ 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
+ 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
+ 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9}
+ 		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  	EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygen", "oxygen\oxygen.vcproj", "{DAB59CC4-E184-40CC-A858-27C432A53AAB}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
+ 	EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcssnet", "utility\rcssnet\rcssnet.vcproj", "{ABCC65CE-0762-42F2-8459-41722DCF02D9}"
***************
*** 32,45 ****
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filesystemstd", "plugin\filesystemstd\filesystemstd.vcproj", "{4A4E1738-60BC-4BB4-AFC8-92320D769D90}"
  	ProjectSection(ProjectDependencies) = postProject
- 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  	EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sexpparser", "plugin\sexpparser\sexpparser.vcproj", "{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}"
  	ProjectSection(ProjectDependencies) = postProject
- 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
- 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
- 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  	EndProjectSection
  EndProject
--- 35,48 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "filesystemstd", "plugin\filesystemstd\filesystemstd.vcproj", "{4A4E1738-60BC-4BB4-AFC8-92320D769D90}"
  	ProjectSection(ProjectDependencies) = postProject
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
+ 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  	EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sexpparser", "plugin\sexpparser\sexpparser.vcproj", "{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}"
  	ProjectSection(ProjectDependencies) = postProject
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
+ 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
+ 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
+ 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  	EndProjectSection
  EndProject
***************
*** 52,62 ****
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsgedit", "..\contrib\rsgedit\rsgedit.vcproj", "{38B680B0-B535-40F0-B5DB-FC307C40C7D6}"
  	ProjectSection(ProjectDependencies) = postProject
- 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9}
- 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
- 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
- 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
- 		{ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9}
- 		{87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230}
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  	EndProjectSection
  EndProject
--- 55,65 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsgedit", "..\contrib\rsgedit\rsgedit.vcproj", "{38B680B0-B535-40F0-B5DB-FC307C40C7D6}"
  	ProjectSection(ProjectDependencies) = postProject
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
+ 		{87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230}
+ 		{ABCC65CE-0762-42F2-8459-41722DCF02D9} = {ABCC65CE-0762-42F2-8459-41722DCF02D9}
+ 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
+ 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
+ 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
+ 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9}
  	EndProjectSection
  EndProject
***************
*** 65,80 ****
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubysceneimporter", "plugin\rubysceneimporter\rubysceneimporter.vcproj", "{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}"
  	ProjectSection(ProjectDependencies) = postProject
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
! 		{87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230}
  	EndProjectSection
  EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inputwx", "..\contrib\plugin\inputwx\inputwx.vcproj", "{038D947F-6223-4EA7-BE4E-A41984923336}"
  	ProjectSection(ProjectDependencies) = postProject
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
! 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9}
  	EndProjectSection
  EndProject
--- 68,100 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubysceneimporter", "plugin\rubysceneimporter\rubysceneimporter.vcproj", "{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}"
  	ProjectSection(ProjectDependencies) = postProject
+ 		{87C2BFBA-8299-432F-B2E6-08E650E74230} = {87C2BFBA-8299-432F-B2E6-08E650E74230}
+ 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
+ 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
+ 	EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inputwx", "..\contrib\plugin\inputwx\inputwx.vcproj", "{038D947F-6223-4EA7-BE4E-A41984923336}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9}
+ 		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
+ 		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
+ 	EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soccer", "..\contrib\plugin\soccer\soccer.vcproj", "{D6BD532A-E11A-4391-A37C-2D55027EE219}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
! 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
! 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9} = {38291F56-23B6-4B5D-8810-D2AD2A379EE9}
! 		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  	EndProjectSection
  EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparkagent", "plugin\sparkagent\sparkagent.vcproj", "{9E5D17FC-5665-48A8-9298-747A3D690787}"
  	ProjectSection(ProjectDependencies) = postProject
  		{B3FAF507-1CEB-437C-8272-30C8DC236192} = {B3FAF507-1CEB-437C-8272-30C8DC236192}
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C} = {17DECC5C-BD53-4ECE-8E4F-707C52D4987C}
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5} = {001EB793-1243-46C2-B693-B23BD1D3D1B5}
! 		{DAB59CC4-E184-40CC-A858-27C432A53AAB} = {DAB59CC4-E184-40CC-A858-27C432A53AAB}
  	EndProjectSection
  EndProject
***************
*** 83,86 ****
--- 103,107 ----
  		Debug|Win32 = Debug|Win32
  		Release|Win32 = Release|Win32
+ 		VCRelease|Win32 = VCRelease|Win32
  	EndGlobalSection
  	GlobalSection(ProjectConfigurationPlatforms) = postSolution
***************
*** 89,140 ****
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5}.Release|Win32.Build.0 = VCRelease|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Debug|Win32.ActiveCfg = Debug|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Debug|Win32.Build.0 = Debug|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Release|Win32.Build.0 = VCRelease|Win32
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Debug|Win32.ActiveCfg = Debug|Win32
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Debug|Win32.Build.0 = Debug|Win32
! 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Release|Win32.ActiveCfg = VcRelease|Win32
! 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Release|Win32.Build.0 = VcRelease|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Debug|Win32.ActiveCfg = Debug|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Debug|Win32.Build.0 = Debug|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Release|Win32.Build.0 = VCRelease|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Debug|Win32.ActiveCfg = Debug|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Debug|Win32.Build.0 = Debug|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Release|Win32.Build.0 = VCRelease|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Debug|Win32.ActiveCfg = Debug|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Debug|Win32.Build.0 = Debug|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Release|Win32.Build.0 = VCRelease|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Debug|Win32.ActiveCfg = Debug|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Debug|Win32.Build.0 = Debug|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Release|Win32.Build.0 = VCRelease|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Debug|Win32.ActiveCfg = Debug|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Debug|Win32.Build.0 = Debug|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Release|Win32.Build.0 = VCRelease|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Debug|Win32.ActiveCfg = Debug|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Debug|Win32.Build.0 = Debug|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Release|Win32.Build.0 = VCRelease|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Debug|Win32.ActiveCfg = Debug|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Debug|Win32.Build.0 = Debug|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Release|Win32.Build.0 = VCRelease|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Debug|Win32.ActiveCfg = Debug|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Debug|Win32.Build.0 = Debug|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Release|Win32.Build.0 = VCRelease|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Debug|Win32.ActiveCfg = Debug|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Debug|Win32.Build.0 = Debug|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Release|Win32.Build.0 = VCRelease|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Debug|Win32.ActiveCfg = Debug|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Debug|Win32.Build.0 = Debug|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Release|Win32.Build.0 = VCRelease|Win32
  	EndGlobalSection
  	GlobalSection(SolutionProperties) = preSolution
--- 110,199 ----
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{001EB793-1243-46C2-B693-B23BD1D3D1B5}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{001EB793-1243-46C2-B693-B23BD1D3D1B5}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{001EB793-1243-46C2-B693-B23BD1D3D1B5}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Debug|Win32.ActiveCfg = Debug|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Debug|Win32.Build.0 = Debug|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{B3FAF507-1CEB-437C-8272-30C8DC236192}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{B3FAF507-1CEB-437C-8272-30C8DC236192}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{B3FAF507-1CEB-437C-8272-30C8DC236192}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Debug|Win32.ActiveCfg = Debug|Win32
  		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Debug|Win32.Build.0 = Debug|Win32
! 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Release|Win32.ActiveCfg = VCRelease|Win32
! 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.Release|Win32.Build.0 = VCRelease|Win32
! 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
! 		{17DECC5C-BD53-4ECE-8E4F-707C52D4987C}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Debug|Win32.ActiveCfg = Debug|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Debug|Win32.Build.0 = Debug|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{FC4C3571-034B-4CB5-9CF3-3411205C9433}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Debug|Win32.ActiveCfg = Debug|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Debug|Win32.Build.0 = Debug|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{DAB59CC4-E184-40CC-A858-27C432A53AAB}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Debug|Win32.ActiveCfg = Debug|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Debug|Win32.Build.0 = Debug|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{ABCC65CE-0762-42F2-8459-41722DCF02D9}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Debug|Win32.ActiveCfg = Debug|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Debug|Win32.Build.0 = Debug|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{38291F56-23B6-4B5D-8810-D2AD2A379EE9}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Debug|Win32.ActiveCfg = Debug|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Debug|Win32.Build.0 = Debug|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{4A4E1738-60BC-4BB4-AFC8-92320D769D90}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Debug|Win32.ActiveCfg = Debug|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Debug|Win32.Build.0 = Debug|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Debug|Win32.ActiveCfg = Debug|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Debug|Win32.Build.0 = Debug|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{38B680B0-B535-40F0-B5DB-FC307C40C7D6}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Debug|Win32.ActiveCfg = Debug|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Debug|Win32.Build.0 = Debug|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{87C2BFBA-8299-432F-B2E6-08E650E74230}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{87C2BFBA-8299-432F-B2E6-08E650E74230}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{87C2BFBA-8299-432F-B2E6-08E650E74230}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Debug|Win32.ActiveCfg = Debug|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Debug|Win32.Build.0 = Debug|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC}.VCRelease|Win32.Build.0 = VCRelease|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Debug|Win32.ActiveCfg = Debug|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Debug|Win32.Build.0 = Debug|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Release|Win32.ActiveCfg = VCRelease|Win32
  		{038D947F-6223-4EA7-BE4E-A41984923336}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{038D947F-6223-4EA7-BE4E-A41984923336}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{038D947F-6223-4EA7-BE4E-A41984923336}.VCRelease|Win32.Build.0 = VCRelease|Win32
+ 		{D6BD532A-E11A-4391-A37C-2D55027EE219}.Debug|Win32.ActiveCfg = Debug|Win32
+ 		{D6BD532A-E11A-4391-A37C-2D55027EE219}.Debug|Win32.Build.0 = Debug|Win32
+ 		{D6BD532A-E11A-4391-A37C-2D55027EE219}.Release|Win32.ActiveCfg = VCRelease|Win32
+ 		{D6BD532A-E11A-4391-A37C-2D55027EE219}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{D6BD532A-E11A-4391-A37C-2D55027EE219}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{D6BD532A-E11A-4391-A37C-2D55027EE219}.VCRelease|Win32.Build.0 = VCRelease|Win32
+ 		{9E5D17FC-5665-48A8-9298-747A3D690787}.Debug|Win32.ActiveCfg = Debug|Win32
+ 		{9E5D17FC-5665-48A8-9298-747A3D690787}.Debug|Win32.Build.0 = Debug|Win32
+ 		{9E5D17FC-5665-48A8-9298-747A3D690787}.Release|Win32.ActiveCfg = VCRelease|Win32
+ 		{9E5D17FC-5665-48A8-9298-747A3D690787}.Release|Win32.Build.0 = VCRelease|Win32
+ 		{9E5D17FC-5665-48A8-9298-747A3D690787}.VCRelease|Win32.ActiveCfg = VCRelease|Win32
+ 		{9E5D17FC-5665-48A8-9298-747A3D690787}.VCRelease|Win32.Build.0 = VCRelease|Win32
  	EndGlobalSection
  	GlobalSection(SolutionProperties) = preSolution
***************
*** 153,159 ****
--- 212,220 ----
  		{949142E4-5E9B-4C5F-9BD9-2EF9DA5CCCA6} = {9FA74610-97C1-48A3-BD56-3C086F819A90}
  		{8A81E2A6-8337-4003-8BDD-59F6F54C2EFC} = {9FA74610-97C1-48A3-BD56-3C086F819A90}
+ 		{9E5D17FC-5665-48A8-9298-747A3D690787} = {9FA74610-97C1-48A3-BD56-3C086F819A90}
  		{A1E81A09-EF57-41FE-AA50-05FF6B1597FC} = {29CFB1A3-30E1-4B18-8BB9-8E1DBAF69B1F}
  		{1A100CE2-0121-4595-AF1F-A15CE8B09D30} = {29CFB1A3-30E1-4B18-8BB9-8E1DBAF69B1F}
  		{038D947F-6223-4EA7-BE4E-A41984923336} = {A1E81A09-EF57-41FE-AA50-05FF6B1597FC}
+ 		{D6BD532A-E11A-4391-A37C-2D55027EE219} = {A1E81A09-EF57-41FE-AA50-05FF6B1597FC}
  		{38B680B0-B535-40F0-B5DB-FC307C40C7D6} = {1A100CE2-0121-4595-AF1F-A15CE8B09D30}
  	EndGlobalSection

[simspark-cvs] simspark/spark/plugin/sparkagent sparkagent.vcproj, NONE, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/sparkagent
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23566/plugin/sparkagent

Added Files:
      Tag: WIN32
	sparkagent.vcproj 
Log Message:
- add spark agent plugins to win32 build

--- NEW FILE: sparkagent.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="sparkagent"
	ProjectGUID="{9E5D17FC-5665-48A8-9298-747A3D690787}"
	RootNamespace="sparkagent"
	Keyword="Win32Proj"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="2"
			CharacterSet="0"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility"
				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				MinimalRebuild="true"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="msvcrt-ruby18.lib ode.lib"
				LinkIncremental="2"
				GenerateDebugInformation="true"
				SubSystem="2"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="VCRelease|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="2"
			CharacterSet="0"
			WholeProgramOptimization="1"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				RuntimeLibrary="2"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="3"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="msvcrt-ruby18.lib"
				LinkIncremental="1"
				GenerateDebugInformation="true"
				SubSystem="2"
				OptimizeReferences="2"
				EnableCOMDATFolding="2"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<File
			RelativePath=".\export.cpp"
			>
		</File>
		<File
			RelativePath=".\hinge2action.h"
			>
		</File>
		<File
			RelativePath=".\hinge2effector.cpp"
			>
		</File>
		<File
			RelativePath=".\hinge2effector.h"
			>
		</File>
		<File
			RelativePath=".\hinge2effector_c.cpp"
			>
		</File>
		<File
			RelativePath=".\hinge2perceptor.cpp"
			>
		</File>
		<File
			RelativePath=".\hinge2perceptor.h"
			>
		</File>
		<File
			RelativePath=".\hinge2perceptor_c.cpp"
			>
		</File>
		<File
			RelativePath=".\hingeaction.h"
			>
		</File>
		<File
			RelativePath=".\hingeeffector.cpp"
			>
		</File>
		<File
			RelativePath=".\hingeeffector.h"
			>
		</File>
		<File
			RelativePath=".\hingeeffector_c.cpp"
			>
		</File>
		<File
			RelativePath=".\hingeperceptor.cpp"
			>
		</File>
		<File
			RelativePath=".\hingeperceptor.h"
			>
		</File>
		<File
			RelativePath=".\hingeperceptor_c.cpp"
			>
		</File>
		<File
			RelativePath=".\timeperceptor.cpp"
			>
		</File>
		<File
			RelativePath=".\timeperceptor.h"
			>
		</File>
		<File
			RelativePath=".\timeperceptor_c.cpp"
			>
		</File>
		<File
			RelativePath=".\universaljointaction.h"
			>
		</File>
		<File
			RelativePath=".\universaljointeffector.cpp"
			>
		</File>
		<File
			RelativePath=".\universaljointeffector.h"
			>
		</File>
		<File
			RelativePath=".\universaljointeffector_c.cpp"
			>
		</File>
		<File
			RelativePath=".\universaljointperceptor.cpp"
			>
		</File>
		<File
			RelativePath=".\universaljointperceptor.h"
			>
		</File>
		<File
			RelativePath=".\universaljointperceptor_c.cpp"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[simspark-cvs] simspark/spark/plugin/rubysceneimporter rubysceneimporter.cpp, 1.2.2.2, 1.2.2.3

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23177

Modified Files:
      Tag: WIN32
	rubysceneimporter.cpp 
Log Message:
- fix setup of parametermap. The first registered variable name was not properly registered.

Index: rubysceneimporter.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rubysceneimporter/rubysceneimporter.cpp,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** rubysceneimporter.cpp	14 Feb 2007 12:34:08 -0000	1.2.2.2
--- rubysceneimporter.cpp	18 Feb 2007 12:05:52 -0000	1.2.2.3
***************
*** 345,349 ****
      int idx = (*iter).second;
  
!     if (idx >= env.parameter->GetSize())
          {
              GetLog()->Error()
--- 345,352 ----
      int idx = (*iter).second;
  
!     if (
!         (idx < 0) ||
!         (idx >= env.parameter->GetSize())
!         )
          {
              GetLog()->Error()
***************
*** 645,649 ****
              // create a new variable
              env.parameter->AddValue(value);
!             env.parameterMap[varname] = (static_cast<int>(env.parameterMap.size()) - 1);
          } else
          {
--- 648,653 ----
              // create a new variable
              env.parameter->AddValue(value);
!             int idx = (static_cast<int>(env.parameterMap.size()));
!             env.parameterMap[varname] = idx;
          } else
          {

[simspark-cvs] simspark/spark/kerosin/sceneserver staticmesh.cpp, 1.2.2.1, 1.2.2.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/kerosin/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22550

Modified Files:
      Tag: WIN32
	staticmesh.cpp 
Log Message:
- dont render mesh if no material are registered

Index: staticmesh.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/sceneserver/staticmesh.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** staticmesh.cpp	10 Feb 2007 19:01:10 -0000	1.2.2.1
--- staticmesh.cpp	18 Feb 2007 12:03:53 -0000	1.2.2.2
***************
*** 76,80 ****
  void StaticMesh::RenderInternal()
  {
!     if (mMesh.get() == 0)
          {
              return;
--- 76,83 ----
  void StaticMesh::RenderInternal()
  {
!     if (
!         (mMesh.get() == 0) ||
!         (mMaterials.empty())
!         )
          {
              return;

[simspark-cvs] simspark/spark/zeitgeist core.cpp, 1.2.2.3, 1.2.2.4 core.h, 1.2.2.2, 1.2.2.3

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21546/zeitgeist

Modified Files:
      Tag: WIN32
	core.cpp core.h 
Log Message:
- use a map instead of a list of registered bundles
- check if a bundle was previously registered and don't load it twice

Index: core.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.cpp,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** core.cpp	16 Feb 2007 15:36:51 -0000	1.2.2.3
--- core.cpp	18 Feb 2007 12:01:55 -0000	1.2.2.4
***************
*** 276,281 ****
  bool Core::ImportBundle(const std::string& bundleName)
  {
!     shared_ptr<SharedLibrary> bundle(new SharedLibrary());
  
      if (!bundle->Open(bundleName))
          {
--- 276,287 ----
  bool Core::ImportBundle(const std::string& bundleName)
  {
!     TBundleMap::const_iterator iter = mBundles.find(bundleName);
!     if (iter != mBundles.end())
!         {
!             // already imported
!             return true;
!         }
  
+     shared_ptr<SharedLibrary> bundle(new SharedLibrary());
      if (!bundle->Open(bundleName))
          {
***************
*** 302,306 ****
      while(!classes.empty())
          {
-             //shared_ptr<Class> theClass(classes.back());
              if (RegisterClassObject(classes.back(), ""))
                  {
--- 308,311 ----
***************
*** 312,318 ****
          }
  
!     // we only add the bundle, if it contained a class which was registered
      if (usingClass)
!         mBundles.push_back(bundle);
  
      return true;
--- 317,324 ----
          }
  
!     // we only add the bundle, if it contained a class which was
!     // registered
      if (usingClass)
!         mBundles[bundleName] = bundle;
  
      return true;
***************
*** 344,348 ****
                  {
                      return entry;
!                 } 
  
              // remove entry as it points to an expired node
--- 350,354 ----
                  {
                      return entry;
!                 }
  
              // remove entry as it points to an expired node
***************
*** 479,494 ****
  }
  
- template <class T>
- struct isUnique: public unary_function<T, bool>
- {
-     bool operator()(const T& x){ return x.unique(); }
- };
- 
  void Core::GarbageCollectBundles()
  {
!     // don't you just love the STL ;-)
!     mBundles.erase(remove_if(
!                              mBundles.begin(), mBundles.end(),
!                              isUnique<shared_ptr<SharedLibrary> >()
!                              ), mBundles.end());
  }
--- 485,503 ----
  }
  
  void Core::GarbageCollectBundles()
  {
!     TBundleMap::iterator iter = mBundles.begin();
! 
!     while (iter != mBundles.end())
!         {
!             const TBundlePair& entry = (*iter);
!             if (entry.second.unique())
!                 {
!                     mBundles.erase(iter);
!                     iter = mBundles.begin();
!                     continue;
!                 }
! 
!             ++iter;
!         }
  }

Index: core.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** core.h	18 Feb 2007 08:51:04 -0000	1.2.2.2
--- core.h	18 Feb 2007 12:01:56 -0000	1.2.2.3
***************
*** 189,192 ****
--- 189,196 ----
      typedef std::map<CacheKey, boost::weak_ptr<Leaf> > TPathCache;
  
+     /** TBundleMap defines a registry of loaded bundles */
+     typedef std::pair<std::string, boost::shared_ptr<salt::SharedLibrary> > TBundlePair;
+     typedef std::map<std::string, boost::shared_ptr<salt::SharedLibrary> > TBundleMap;
+ 
      //
      // functions
***************
*** 339,347 ****
      boost::weak_ptr<Core>                   mSelf;
  
!     /** a list of all registered bundles. Whenever we load a
!         bundle, we add it to this list. This is necessary, because
!         we have to keep the connection to each bundle open, until
!         all the class objects belonging to it are completely
!         destructed.
  
          This workaround is very ugly ... it cost me about 3-4
--- 343,350 ----
      boost::weak_ptr<Core>                   mSelf;
  
!     /** a registry of all registered bundles. Whenever we load a
!         bundle, we add it to this map. This is necessary, because we
!         have to keep the connection to each bundle open, until all the
!         class objects belonging to it are completely destructed.
  
          This workaround is very ugly ... it cost me about 3-4
***************
*** 365,369 ****
          enough.
      */
!     std::list<boost::shared_ptr<salt::SharedLibrary> >      mBundles;
  
      //! the internal node lookup cache
--- 368,372 ----
          enough.
      */
!     TBundleMap mBundles;
  
      //! the internal node lookup cache

[simspark-cvs] simspark/contrib/rsgedit constants.h, 1.1.2.2, 1.1.2.3

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22474

Modified Files:
      Tag: WIN32
	constants.h 
Log Message:
- used an enum to define command ids

Index: constants.h
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/constants.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** constants.h	16 Feb 2007 17:06:00 -0000	1.1.2.2
--- constants.h	18 Feb 2007 09:12:42 -0000	1.1.2.3
***************
*** 27,39 ****
    };
  
! #define ID_SIM_START (wxID_HIGHEST+10)
! #define ID_SIM_PAUSE (wxID_HIGHEST+11)
  
! #define ID_VIEW_LOG  (wxID_HIGHEST+20)
! #define ID_VIEW_TREE (wxID_HIGHEST+21)
! #define ID_VIEW_TOOLBAR (wxID_HIGHEST+22)
  
! #define ID_FILE_OPEN (wxID_HIGHEST+23)
! #define ID_FILE_RELOAD (wxID_HIGHEST+24)
  
  #endif // RSGEDIT_CONSTANTS_H
--- 27,42 ----
    };
  
! enum ECommandIds
!     {
!         ID_SIM_START = (wxID_HIGHEST+10),
!         ID_SIM_PAUSE = (wxID_HIGHEST+11),
  
!         ID_VIEW_LOG  = (wxID_HIGHEST+20),
!         ID_VIEW_TREE = (wxID_HIGHEST+21),
!         ID_VIEW_TOOLBAR = (wxID_HIGHEST+22),
  
!         ID_FILE_OPEN = (wxID_HIGHEST+23),
!         ID_FILE_RELOAD = (wxID_HIGHEST+24)
!     };
  
  #endif // RSGEDIT_CONSTANTS_H

[simspark-cvs] simspark/contrib/rsgedit mainframe.cpp, 1.8.2.5, 1.8.2.6 mainframe.h, 1.7.2.4, 1.7.2.5

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/rsgedit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15476

Modified Files:
      Tag: WIN32
	mainframe.cpp mainframe.h 
Log Message:
- added UpdateCached() that updates the cached references in Spark and all property windows

Index: mainframe.h
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -C2 -d -r1.7.2.4 -r1.7.2.5
*** mainframe.h	16 Feb 2007 17:06:41 -0000	1.7.2.4
--- mainframe.h	18 Feb 2007 08:53:31 -0000	1.7.2.5
***************
*** 130,133 ****
--- 130,137 ----
      void RefreshProperties();
  
+     /** updated any cached references */
+     void UpdateCached();
+ 
+ 
  protected:
      // begin wxGlade: mainframe::attributes

Index: mainframe.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -d -r1.8.2.5 -r1.8.2.6
*** mainframe.cpp	18 Feb 2007 08:07:37 -0000	1.8.2.5
--- mainframe.cpp	18 Feb 2007 08:53:31 -0000	1.8.2.6
***************
*** 525,528 ****
--- 525,555 ----
  }
  
+ void mainframe::UpdateCached()
+ {
+     shared_ptr<SimSpark> spark = wxGetApp().GetSpark();
+     if (spark.get() == 0)
+         {
+             return;
+         }
+ 
+     spark->UpdateCached();
+ 
+     wxWindowList& children = GetChildren();
+     for (
+          wxWindowList::Node *node = children.GetFirst();
+          node != 0;
+          node = node->GetNext()
+          )
+         {
+             propertyframe* pf = dynamic_cast<propertyframe*>(node->GetData());
+             if (pf == 0)
+                 {
+                     continue;
+                 }
+ 
+             pf->UpdateCached();
+         }
+ }
+ 
  void mainframe::OnUpdateViewTree(wxUpdateUIEvent& event)
  {
***************
*** 583,587 ****
      }
  
!     spark->UpdateCached();
  
      shared_ptr<SimulationServer> sim = spark->GetSimulationServer();
--- 610,614 ----
      }
  
!     UpdateCached();
  
      shared_ptr<SimulationServer> sim = spark->GetSimulationServer();