[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15335] trunk/blender: BGE patch: Add NAND , NOR, XOR, XNOR controllers.

Benoit Bolsee benoit.bolsee at online.be
Mon Jun 23 22:41:26 CEST 2008


Revision: 15335
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15335
Author:   ben2610
Date:     2008-06-23 22:41:18 +0200 (Mon, 23 Jun 2008)

Log Message:
-----------
BGE patch: Add NAND, NOR, XOR, XNOR controllers.

NAND controller is an inverted AND controller: the output is 
     1 if any of the input is 0.
NOR  controller is an inverted OR controller: the output is 0
     if any of the input is 1.
XOR  controller is an exclusive OR: the output is 1 if and only
     if one input is 1 and all the other inputs are 0.
XNOR controller is an inverted XOR: the output is 0 if and only
     if one input is 0 and all the other inputs are 0.
The NAND, NORT and XNOR controllers are very usefull to create
complementary outputs to start and stop actuators synchronously.
MSCV project files updated.

Modified Paths:
--------------
    trunk/blender/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
    trunk/blender/source/blender/makesdna/DNA_controller_types.h
    trunk/blender/source/blender/src/buttons_logic.c
    trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp

Added Paths:
-----------
    trunk/blender/source/gameengine/GameLogic/SCA_NANDController.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_NANDController.h
    trunk/blender/source/gameengine/GameLogic/SCA_NORController.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_NORController.h
    trunk/blender/source/gameengine/GameLogic/SCA_XNORController.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_XNORController.h
    trunk/blender/source/gameengine/GameLogic/SCA_XORController.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_XORController.h

Modified: trunk/blender/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
===================================================================
--- trunk/blender/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj	2008-06-23 20:29:32 UTC (rev 15334)
+++ trunk/blender/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj	2008-06-23 20:41:18 UTC (rev 15335)
@@ -396,6 +396,12 @@
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.cpp">
 			</File>
 			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NANDController.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NORController.cpp">
+			</File>
+			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ORController.cpp">
 			</File>
 			<File
@@ -425,6 +431,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XNORController.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XORController.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -499,6 +511,12 @@
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.h">
 			</File>
 			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NANDController.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NORController.h">
+			</File>
+			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ORController.h">
 			</File>
 			<File
@@ -528,6 +546,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XNORController.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XORController.h">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/blender/source/blender/makesdna/DNA_controller_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_controller_types.h	2008-06-23 20:29:32 UTC (rev 15334)
+++ trunk/blender/source/blender/makesdna/DNA_controller_types.h	2008-06-23 20:41:18 UTC (rev 15335)
@@ -66,6 +66,10 @@
 #define CONT_LOGIC_OR	1
 #define CONT_EXPRESSION	2
 #define CONT_PYTHON		3
+#define CONT_LOGIC_NAND	4
+#define CONT_LOGIC_NOR	5
+#define CONT_LOGIC_XOR	6
+#define CONT_LOGIC_XNOR	7
 
 /* controller->flag */
 #define CONT_SHOW		1

Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c	2008-06-23 20:29:32 UTC (rev 15334)
+++ trunk/blender/source/blender/src/buttons_logic.c	2008-06-23 20:41:18 UTC (rev 15335)
@@ -740,6 +740,14 @@
 		return "AND";
 	case CONT_LOGIC_OR:
 		return "OR";
+	case CONT_LOGIC_NAND:
+		return "NAND";
+	case CONT_LOGIC_NOR:
+		return "NOR";
+	case CONT_LOGIC_XOR:
+		return "XOR";
+	case CONT_LOGIC_XNOR:
+		return "XNOR";
 	case CONT_EXPRESSION:
 		return "Expression";
 	case CONT_PYTHON:
@@ -750,7 +758,7 @@
 
 static char *controller_pup(void)
 {
-	return "Controllers   %t|AND %x0|OR %x1|Expression %x2|Python %x3";
+	return "Controllers   %t|AND %x0|OR %x1|XOR %x6|NAND %x4|NOR %x5|XNOR %x7|Expression %x2|Python %x3";
 }
 
 static char *actuator_name(int type)
@@ -1066,6 +1074,10 @@
 			 (short)(x + 10 + 0.85 * (w-20)), (short)(y - 19), (short)(0.15 * (w-20)), 19,
 			 &sens->invert, 0.0, 0.0, 0, 0,
 			 "Invert the level (output) of this sensor");
+	uiDefButS(block, TOG, 1, "Lvl",
+			 (short)(x + 10 + 0.70 * (w-20)), (short)(y - 19), (short)(0.15 * (w-20)), 19,
+			 &sens->level, 0.0, 0.0, 0, 0,
+			 "Level detector versus edge detector (only applicable in case of logic state transition)");
 }
 
 static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short yco, short width,char* objectname)

Modified: trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp	2008-06-23 20:29:32 UTC (rev 15334)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp	2008-06-23 20:41:18 UTC (rev 15335)
@@ -35,6 +35,10 @@
 // Controller
 #include "SCA_ANDController.h"
 #include "SCA_ORController.h"
+#include "SCA_NANDController.h"
+#include "SCA_NORController.h"
+#include "SCA_XORController.h"
+#include "SCA_XNORController.h"
 #include "SCA_PythonController.h"
 #include "SCA_ExpressionController.h"
 
@@ -112,6 +116,30 @@
 				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
 				break;
 			}
+			case CONT_LOGIC_NAND:
+			{
+				gamecontroller = new SCA_NANDController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_NOR:
+			{
+				gamecontroller = new SCA_NORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XOR:
+			{
+				gamecontroller = new SCA_XORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XNOR:
+			{
+				gamecontroller = new SCA_XNORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
 			case CONT_EXPRESSION:
 			{
 				bExpressionCont* bexpcont = (bExpressionCont*) bcontr->data;

Added: trunk/blender/source/gameengine/GameLogic/SCA_NANDController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_NANDController.cpp	                        (rev 0)
+++ trunk/blender/source/gameengine/GameLogic/SCA_NANDController.cpp	2008-06-23 20:41:18 UTC (rev 15335)
@@ -0,0 +1,144 @@
+/**
+ * 'Nand' together all inputs
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "SCA_NANDController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_NANDController::SCA_NANDController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_NANDController::~SCA_NANDController()
+{
+}
+
+
+
+void SCA_NANDController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = false;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (!sensor->IsPositiveTrigger())
+		{
+			sensorresult = true;
+			break;
+		}
+	}
+	
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_NANDController::GetReplica()
+{
+	CValue* replica = new SCA_NANDController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_NANDController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_NANDController",
+	sizeof(SCA_NANDController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_NANDController::Parents[] = {
+	&SCA_NANDController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_NANDController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_NANDController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */


Property changes on: trunk/blender/source/gameengine/GameLogic/SCA_NANDController.cpp
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/blender/source/gameengine/GameLogic/SCA_NANDController.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_NANDController.h	                        (rev 0)
+++ trunk/blender/source/gameengine/GameLogic/SCA_NANDController.h	2008-06-23 20:41:18 UTC (rev 15335)
@@ -0,0 +1,56 @@
+/**
+ * SCA_NANDController.h
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list